diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-06-16 12:20:53 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-06-16 12:20:53 +0000 |
commit | a33eea3c09788d6c596c559cf2248e8908b75961 (patch) | |
tree | 3872b0153b0a0328798d382f3cdbf1d53fe753de | |
parent | 774fb63daa28f0effa2742ab894f55c2bc3aee39 (diff) | |
download | gnunet-a33eea3c09788d6c596c559cf2248e8908b75961.tar.gz gnunet-a33eea3c09788d6c596c559cf2248e8908b75961.zip |
stat
-rw-r--r-- | src/fs/gnunet-service-fs_pr.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c index 5e21e35ca..2a6897cfb 100644 --- a/src/fs/gnunet-service-fs_pr.c +++ b/src/fs/gnunet-service-fs_pr.c | |||
@@ -382,6 +382,10 @@ GSF_pending_request_create_ (enum GSF_PendingRequestOptions options, | |||
382 | GSF_pending_request_cancel_ (dpr); | 382 | GSF_pending_request_cancel_ (dpr); |
383 | } | 383 | } |
384 | } | 384 | } |
385 | GNUNET_STATISTICS_update (GSF_stats, | ||
386 | gettext_noop ("# Pending requests active"), | ||
387 | 1, | ||
388 | GNUNET_NO); | ||
385 | return pr; | 389 | return pr; |
386 | } | 390 | } |
387 | 391 | ||
@@ -612,6 +616,14 @@ clean_request (void *cls, | |||
612 | GNUNET_SCHEDULER_cancel (pr->warn_task); | 616 | GNUNET_SCHEDULER_cancel (pr->warn_task); |
613 | pr->warn_task = GNUNET_SCHEDULER_NO_TASK; | 617 | pr->warn_task = GNUNET_SCHEDULER_NO_TASK; |
614 | } | 618 | } |
619 | GNUNET_assert (GNUNET_OK == | ||
620 | GNUNET_CONTAINER_multihashmap_remove (pr_map, | ||
621 | &pr->public_data.query, | ||
622 | pr)); | ||
623 | GNUNET_STATISTICS_update (GSF_stats, | ||
624 | gettext_noop ("# Pending requests active"), | ||
625 | -1, | ||
626 | GNUNET_NO); | ||
615 | GNUNET_free (pr); | 627 | GNUNET_free (pr); |
616 | return GNUNET_YES; | 628 | return GNUNET_YES; |
617 | } | 629 | } |
@@ -627,10 +639,6 @@ GSF_pending_request_cancel_ (struct GSF_PendingRequest *pr) | |||
627 | { | 639 | { |
628 | if (NULL == pr_map) | 640 | if (NULL == pr_map) |
629 | return; /* already cleaned up! */ | 641 | return; /* already cleaned up! */ |
630 | GNUNET_assert (GNUNET_OK == | ||
631 | GNUNET_CONTAINER_multihashmap_remove (pr_map, | ||
632 | &pr->public_data.query, | ||
633 | pr)); | ||
634 | GNUNET_assert (GNUNET_YES == | 642 | GNUNET_assert (GNUNET_YES == |
635 | clean_request (NULL, &pr->public_data.query, pr)); | 643 | clean_request (NULL, &pr->public_data.query, pr)); |
636 | } | 644 | } |