[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12797 - gnunet/src/dv
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12797 - gnunet/src/dv |
Date: |
Wed, 1 Sep 2010 15:21:45 +0200 |
Author: nevans
Date: 2010-09-01 15:21:45 +0200 (Wed, 01 Sep 2010)
New Revision: 12797
Modified:
gnunet/src/dv/gnunet-service-dv.c
gnunet/src/dv/test_transport_api_dv.c
Log:
klocwork fixes
Modified: gnunet/src/dv/gnunet-service-dv.c
===================================================================
--- gnunet/src/dv/gnunet-service-dv.c 2010-09-01 13:21:03 UTC (rev 12796)
+++ gnunet/src/dv/gnunet-service-dv.c 2010-09-01 13:21:45 UTC (rev 12797)
@@ -648,6 +648,11 @@
static struct GNUNET_CONTAINER_Heap *neighbor_max_heap;
/**
+ * Handle for the statistics service.
+ */
+struct GNUNET_STATISTICS_Handle *stats;
+
+/**
* How far out to keep peers we learn about.
*/
static unsigned long long fisheye_depth;
@@ -2803,12 +2808,19 @@
}
sent = GNUNET_CONTAINER_multihashmap_iterate (extended_neighbors,
&add_all_extended_peers, neighbor->send_context);
-
+ if (stats != NULL)
+ {
+ GNUNET_STATISTICS_update (stats, "# distant peers gossiped to direct
neighbors", sent, GNUNET_NO);
+ }
#if DEBUG_DV_PEER_NUMBERS
neighbor_pid = GNUNET_strdup(GNUNET_i2s(&neighbor->identity));
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s: Gossipped %d extended peers to
%s\n", GNUNET_i2s(&my_identity), sent, neighbor_pid);
#endif
sent = GNUNET_CONTAINER_multihashmap_iterate (direct_neighbors,
&add_all_direct_neighbors, neighbor);
+ if (stats != NULL)
+ {
+ GNUNET_STATISTICS_update (stats, "# direct peers gossiped to direct
neighbors", sent, GNUNET_NO);
+ }
#if DEBUG_DV_PEER_NUMBERS
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s: Gossipped about %s to %d direct
peers\n", GNUNET_i2s(&my_identity), neighbor_pid, sent);
GNUNET_free(neighbor_pid);
@@ -2875,7 +2887,13 @@
{
about = GNUNET_CONTAINER_multihashmap_get(extended_neighbors,
&peer->hashPubKey);
if ((GNUNET_CONTAINER_multihashmap_get(direct_neighbors,
&peer->hashPubKey) == NULL) && (about != NULL))
- sent = GNUNET_CONTAINER_multihashmap_iterate(direct_neighbors,
&add_distant_all_direct_neighbors, about);
+ {
+ sent = GNUNET_CONTAINER_multihashmap_iterate(direct_neighbors,
&add_distant_all_direct_neighbors, about);
+ if (stats != NULL)
+ {
+ GNUNET_STATISTICS_update (stats, "# direct peers gossiped to new
direct neighbors", sent, GNUNET_NO);
+ }
+ }
#if DEBUG_DV
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%s: Distance (%d) greater than %d or already know about peer
(%s), not re-adding!\n", "dv", distance, DIRECT_NEIGHBOR_COST,
GNUNET_i2s(peer));
Modified: gnunet/src/dv/test_transport_api_dv.c
===================================================================
--- gnunet/src/dv/test_transport_api_dv.c 2010-09-01 13:21:03 UTC (rev
12796)
+++ gnunet/src/dv/test_transport_api_dv.c 2010-09-01 13:21:45 UTC (rev
12797)
@@ -198,7 +198,6 @@
struct PeerContext *free_peer_pos;
struct TestMessageContext *pos;
struct TestMessageContext *free_pos;
- int count;
#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -215,7 +214,6 @@
}
all_peers = NULL;
- count = 0;
pos = test_messages;
while (pos != NULL)
{
@@ -834,6 +832,7 @@
if (second_daemon == NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Couldn't find second peer!\n");
+ GNUNET_free(second_shortname);
return;
}
#if !TEST_ALL
@@ -1059,6 +1058,7 @@
main_cfg = cfg;
+ GNUNET_assert(num_peers > 0 && num_peers < (unsigned int)-1);
peers_left = num_peers;
/* Set up a task to end testing if peer start fails */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12797 - gnunet/src/dv,
gnunet <=