/*
This file is part of GNUnet.
- Copyright (C) 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
{
/**
- * Handle to generic request.
+ * Handle to generic request (generic: from peer or local client).
*/
struct GSF_PendingRequest *pr;
/**
- * Handle to specific peer.
+ * Which specific peer issued this request?
*/
struct GSF_ConnectedPeer *cp;
struct GNUNET_SCHEDULER_Task *rc_delay_task;
/**
- * Active requests from this neighbour, map of query to 'struct PeerRequest'.
+ * Active requests from this neighbour, map of query to `struct PeerRequest`.
*/
struct GNUNET_CONTAINER_MultiHashMap *request_map;
*/
static struct GNUNET_PEERSTORE_Handle *peerstore;
+/**
+ * Task used to flush respect values to disk.
+ */
+static struct GNUNET_SCHEDULER_Task *fr_task;
+
/**
* Update the latency information kept for the given peer.
* (re)try to reserve bandwidth from the given peer.
*
* @param cls the `struct GSF_ConnectedPeer` to reserve from
- * @param tc scheduler context
*/
static void
-retry_reservation (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+retry_reservation (void *cls)
{
struct GSF_ConnectedPeer *cp = cls;
struct GNUNET_PeerIdentity target;
* @param cls handle to connected peer entry
* @param record peerstore record information
* @param emsg error message, or NULL if no errors
- * @return #GNUNET_NO to stop iterating since we only expect 0 or 1 records
*/
-static int
+static void
peer_respect_cb (void *cls,
const struct GNUNET_PEERSTORE_Record *record,
const char *emsg)
struct GSF_ConnectedPeer *cp = cls;
GNUNET_assert (NULL != cp->respect_iterate_req);
- cp->respect_iterate_req = NULL;
if ((NULL != record) && (sizeof (cp->disk_respect) == record->value_size))
cp->disk_respect = cp->ppd.respect = *((uint32_t *)record->value);
GSF_push_start_ (cp);
if (NULL != cp->creation_cb)
cp->creation_cb (cp->creation_cb_cls, cp);
- return GNUNET_NO;
+ if (NULL != record)
+ GNUNET_PEERSTORE_iterate_cancel (cp->respect_iterate_req);
+ cp->respect_iterate_req = NULL;
}
cp->ppd.pid = GNUNET_PEER_intern (peer);
cp->ppd.transmission_delay = GNUNET_LOAD_value_init (GNUNET_TIME_UNIT_ZERO);
cp->rc =
- GNUNET_ATS_reserve_bandwidth (GSF_ats, peer, DBLOCK_SIZE,
+ GNUNET_ATS_reserve_bandwidth (GSF_ats,
+ peer,
+ DBLOCK_SIZE,
&ats_reserve_callback, cp);
- cp->request_map = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
+ cp->request_map = GNUNET_CONTAINER_multihashmap_create (128,
+ GNUNET_YES);
GNUNET_break (GNUNET_OK ==
GNUNET_CONTAINER_multipeermap_put (cp_map,
GSF_connected_peer_get_identity2_ (cp),
cp,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
- GNUNET_STATISTICS_set (GSF_stats, gettext_noop ("# peers connected"),
+ GNUNET_STATISTICS_set (GSF_stats,
+ gettext_noop ("# peers connected"),
GNUNET_CONTAINER_multipeermap_size (cp_map),
GNUNET_NO);
cp->creation_cb = creation_cb;
* peer. Check, and if so, restart migration.
*
* @param cls the `struct GSF_ConnectedPeer`
- * @param tc scheduler context
*/
static void
-revive_migration (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+revive_migration (void *cls)
{
struct GSF_ConnectedPeer *cp = cls;
struct GNUNET_TIME_Relative bt;
* Free resources associated with the given peer request.
*
* @param peerreq request to free
- * @param query associated key for the request
*/
static void
-free_pending_request (struct PeerRequest *peerreq,
- const struct GNUNET_HashCode *query)
+free_pending_request (struct PeerRequest *peerreq)
{
struct GSF_ConnectedPeer *cp = peerreq->cp;
+ struct GSF_PendingRequestData *prd;
+ prd = GSF_pending_request_get_data_ (peerreq->pr);
if (NULL != peerreq->kill_task)
{
GNUNET_SCHEDULER_cancel (peerreq->kill_task);
peerreq->kill_task = NULL;
}
- GNUNET_STATISTICS_update (GSF_stats, gettext_noop ("# P2P searches active"),
- -1, GNUNET_NO);
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop ("# P2P searches active"),
+ -1,
+ GNUNET_NO);
GNUNET_break (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_remove (cp->request_map,
- query,
+ &prd->query,
peerreq));
GNUNET_free (peerreq);
}
{
struct PeerRequest *peerreq = value;
struct GSF_PendingRequest *pr = peerreq->pr;
- struct GSF_PendingRequestData *prd;
- prd = GSF_pending_request_get_data_ (pr);
- GSF_pending_request_cancel_ (pr, GNUNET_NO);
- free_pending_request (peerreq, &prd->query);
+ free_pending_request (peerreq);
+ GSF_pending_request_cancel_ (pr,
+ GNUNET_NO);
return GNUNET_OK;
}
* Free the given request.
*
* @param cls the request to free
- * @param tc task context
*/
static void
-peer_request_destroy (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+peer_request_destroy (void *cls)
{
struct PeerRequest *peerreq = cls;
struct GSF_PendingRequest *pr = peerreq->pr;
peerreq->kill_task = NULL;
prd = GSF_pending_request_get_data_ (pr);
- cancel_pending_request (NULL, &prd->query, peerreq);
+ cancel_pending_request (NULL,
+ &prd->query,
+ peerreq);
}
* The artificial delay is over, transmit the message now.
*
* @param cls the `struct GSF_DelayedHandle` with the message
- * @param tc scheduler context
*/
static void
-transmit_delayed_now (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+transmit_delayed_now (void *cls)
{
struct GSF_DelayedHandle *dh = cls;
struct GSF_ConnectedPeer *cp = dh->cp;
cp->delayed_tail,
dh);
cp->delay_queue_size--;
- if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
- {
- GNUNET_free (dh->pm);
- GNUNET_free (dh);
- return;
- }
(void) GSF_peer_transmit_ (cp,
GNUNET_NO,
UINT32_MAX,
prd = GSF_pending_request_get_data_ (pr);
if (NULL == data)
{
- free_pending_request (peerreq, &prd->query);
+ free_pending_request (peerreq);
return;
}
GNUNET_break (GNUNET_BLOCK_TYPE_ANY != type);
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop
("# P2P searches destroyed due to ultimate reply"),
- 1, GNUNET_NO);
+ 1,
+ GNUNET_NO);
peerreq->kill_task =
- GNUNET_SCHEDULER_add_now (&peer_request_destroy, peerreq);
+ GNUNET_SCHEDULER_add_now (&peer_request_destroy,
+ peerreq);
}
}
* @return effective priority
*/
static int32_t
-bound_priority (uint32_t prio_in, struct GSF_ConnectedPeer *cp)
+bound_priority (uint32_t prio_in,
+ struct GSF_ConnectedPeer *cp)
{
#define N ((double)128.0)
uint32_t ret;
*
* @param ttl_in requested ttl
* @param prio given priority
- * @return ttl_in if ttl_in is below the limit,
- * otherwise the ttl-limit for the given priority
+ * @return @a ttl_in if @a ttl_in is below the limit,
+ * otherwise the ttl-limit for the given @a prio
*/
static int32_t
-bound_ttl (int32_t ttl_in, uint32_t prio)
+bound_ttl (int32_t ttl_in,
+ uint32_t prio)
{
unsigned long long allowed;
}
/* existing request has lower TTL, drop old one! */
tec->priority += prd->priority;
- GSF_pending_request_cancel_ (pr, GNUNET_YES);
- free_pending_request (peerreq,
- hc);
+ free_pending_request (peerreq);
+ GSF_pending_request_cancel_ (pr,
+ GNUNET_YES);
return GNUNET_NO;
}
-
/**
* Handle P2P "QUERY" message. Creates the pending request entry
* and sets up all of the data structures to that we will
uint32_t ttl_decrement;
struct TestExistClosure tec;
GNUNET_PEER_Id spid;
+ const struct GSF_PendingRequestData *prd;
msize = ntohs (message->size);
if (msize < sizeof (struct GetMessage))
spid,
GNUNET_PEER_intern (other),
NULL, 0, /* replies_seen */
- &handle_p2p_reply, peerreq);
+ &handle_p2p_reply,
+ peerreq);
GNUNET_assert (NULL != pr);
+ prd = GSF_pending_request_get_data_ (pr);
peerreq->pr = pr;
GNUNET_break (GNUNET_OK ==
GNUNET_CONTAINER_multihashmap_put (cp->request_map,
- &gm->query,
+ &prd->query,
peerreq,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop
- ("# P2P query messages received and processed"), 1,
+ gettext_noop ("# P2P query messages received and processed"),
+ 1,
+ GNUNET_NO);
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop ("# P2P searches active"),
+ 1,
GNUNET_NO);
- GNUNET_STATISTICS_update (GSF_stats, gettext_noop ("# P2P searches active"),
- 1, GNUNET_NO);
return pr;
}
* a transmission request.
*
* @param cls the `struct GSF_PeerTransmitHandle` of the request
- * @param tc scheduler context
*/
static void
-peer_transmit_timeout (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+peer_transmit_timeout (void *cls)
{
struct GSF_PeerTransmitHandle *pth = cls;
struct GSF_ConnectedPeer *cp;
cp->request_map = NULL;
GSF_plan_notify_peer_disconnect_ (cp);
GNUNET_LOAD_value_free (cp->ppd.transmission_delay);
- GNUNET_PEER_decrement_rcs (cp->ppd.last_p2p_replies, P2P_SUCCESS_LIST_SIZE);
- memset (cp->ppd.last_p2p_replies, 0, sizeof (cp->ppd.last_p2p_replies));
+ GNUNET_PEER_decrement_rcs (cp->ppd.last_p2p_replies,
+ P2P_SUCCESS_LIST_SIZE);
+ memset (cp->ppd.last_p2p_replies,
+ 0,
+ sizeof (cp->ppd.last_p2p_replies));
GSF_push_stop_ (cp);
if (NULL != cp->cth)
{
* Call this method periodically to flush respect information to disk.
*
* @param cls closure, not used
- * @param tc task context, not used
*/
static void
-cron_flush_respect (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+cron_flush_respect (void *cls)
{
- if (NULL == cp_map)
- return;
+ fr_task = NULL;
GNUNET_CONTAINER_multipeermap_iterate (cp_map,
- &flush_respect, NULL);
- if (NULL == tc)
- return;
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- return;
- GNUNET_SCHEDULER_add_delayed_with_priority (RESPECT_FLUSH_FREQ,
- GNUNET_SCHEDULER_PRIORITY_HIGH,
- &cron_flush_respect, NULL);
+ &flush_respect,
+ NULL);
+ fr_task = GNUNET_SCHEDULER_add_delayed_with_priority (RESPECT_FLUSH_FREQ,
+ GNUNET_SCHEDULER_PRIORITY_HIGH,
+ &cron_flush_respect, NULL);
}
{
cp_map = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_YES);
peerstore = GNUNET_PEERSTORE_connect (GSF_cfg);
- GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_HIGH,
- &cron_flush_respect, NULL);
+ fr_task = GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_HIGH,
+ &cron_flush_respect, NULL);
}
void
GSF_connected_peer_done_ ()
{
- cron_flush_respect (NULL, NULL);
GNUNET_CONTAINER_multipeermap_iterate (cp_map,
- &clean_peer, NULL);
+ &flush_respect,
+ NULL);
+ GNUNET_CONTAINER_multipeermap_iterate (cp_map,
+ &clean_peer,
+ NULL);
+ GNUNET_SCHEDULER_cancel (fr_task);
+ fr_task = NULL;
GNUNET_CONTAINER_multipeermap_destroy (cp_map);
cp_map = NULL;
- GNUNET_PEERSTORE_disconnect (peerstore, GNUNET_YES);
+ GNUNET_PEERSTORE_disconnect (peerstore,
+ GNUNET_YES);
+
}