[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8141 - GNUnet/src/applications/dv/module
From: |
gnunet |
Subject: |
[GNUnet-SVN] r8141 - GNUnet/src/applications/dv/module |
Date: |
Tue, 20 Jan 2009 15:54:23 -0700 (MST) |
Author: nevans
Date: 2009-01-20 15:54:23 -0700 (Tue, 20 Jan 2009)
New Revision: 8141
Modified:
GNUnet/src/applications/dv/module/dv.c
GNUnet/src/applications/dv/module/heap.c
Log:
pre-commit
Modified: GNUnet/src/applications/dv/module/dv.c
===================================================================
--- GNUnet/src/applications/dv/module/dv.c 2009-01-20 22:49:01 UTC (rev
8140)
+++ GNUnet/src/applications/dv/module/dv.c 2009-01-20 22:54:23 UTC (rev
8141)
@@ -168,12 +168,12 @@
memcpy (neighbor->neighbor, peer, sizeof (GNUNET_PeerIdentity));
if (referrer == NULL)
- neighbor->referrer = NULL;
- else
- {
- neighbor->referrer = GNUNET_malloc (sizeof
(GNUNET_PeerIdentity));
- memcpy (neighbor->referrer, referrer, sizeof
(GNUNET_PeerIdentity));
- }
+ neighbor->referrer = NULL;
+ else
+ {
+ neighbor->referrer = GNUNET_malloc (sizeof (GNUNET_PeerIdentity));
+ memcpy (neighbor->referrer, referrer, sizeof (GNUNET_PeerIdentity));
+ }
GNUNET_multi_hash_map_put (ctx->extended_neighbors, &peer->hashPubKey,
neighbor, GNUNET_MultiHashMapOption_REPLACE);
@@ -188,45 +188,49 @@
GNUNET_multi_hash_map_get (ctx->extended_neighbors,
&peer->hashPubKey);
- if ( (neighbor->cost != cost) &&
- (((neighbor->referrer == NULL) && (referrer == NULL)) ||
- (((neighbor->referrer != NULL) && (referrer != NULL)) &&
(memcmp (neighbor->referrer, referrer, sizeof (GNUNET_PeerIdentity))
- == 0))))
- {
- neighbor->cost = cost;
- GNUNET_DV_Heap_updatedCost
(&ctx->neighbor_max_heap, neighbor);
- GNUNET_DV_Heap_updatedCost
(&ctx->neighbor_min_heap, neighbor);
- }
- else if (neighbor->cost > cost)
- {
- GNUNET_DV_Heap_removeNode (&ctx->neighbor_max_heap, neighbor);
- GNUNET_DV_Heap_removeNode (&ctx->neighbor_min_heap, neighbor);
- GNUNET_free (neighbor->neighbor);
- if (neighbor->referrer != NULL)
- GNUNET_free (neighbor->referrer);
- GNUNET_free (neighbor);
+ if ((neighbor->cost != cost) &&
+ (((neighbor->referrer == NULL) && (referrer == NULL)) ||
+ (((neighbor->referrer != NULL) && (referrer != NULL))
+ &&
+ (memcmp
+ (neighbor->referrer, referrer,
+ sizeof (GNUNET_PeerIdentity)) == 0))))
+ {
+ neighbor->cost = cost;
+ GNUNET_DV_Heap_updatedCost (&ctx->neighbor_max_heap, neighbor);
+ GNUNET_DV_Heap_updatedCost (&ctx->neighbor_min_heap, neighbor);
+ }
+ else if (neighbor->cost > cost)
+ {
+ GNUNET_DV_Heap_removeNode (&ctx->neighbor_max_heap, neighbor);
+ GNUNET_DV_Heap_removeNode (&ctx->neighbor_min_heap, neighbor);
+ GNUNET_free (neighbor->neighbor);
+ if (neighbor->referrer != NULL)
+ GNUNET_free (neighbor->referrer);
+ GNUNET_free (neighbor);
- neighbor = GNUNET_malloc (sizeof (struct GNUNET_dv_neighbor));
- neighbor->cost = cost;
- neighbor->neighbor = GNUNET_malloc (sizeof
(GNUNET_PeerIdentity));
- memcpy (neighbor->neighbor, peer, sizeof (GNUNET_PeerIdentity));
- if (referrer == NULL)
- neighbor->referrer = NULL;
- else
- {
- neighbor->referrer = GNUNET_malloc (sizeof
(GNUNET_PeerIdentity));
- memcpy (neighbor->referrer, referrer,
- sizeof (GNUNET_PeerIdentity));
- }
+ neighbor = GNUNET_malloc (sizeof (struct GNUNET_dv_neighbor));
+ neighbor->cost = cost;
+ neighbor->neighbor = GNUNET_malloc (sizeof (GNUNET_PeerIdentity));
+ memcpy (neighbor->neighbor, peer, sizeof (GNUNET_PeerIdentity));
+ if (referrer == NULL)
+ neighbor->referrer = NULL;
+ else
+ {
+ neighbor->referrer =
+ GNUNET_malloc (sizeof (GNUNET_PeerIdentity));
+ memcpy (neighbor->referrer, referrer,
+ sizeof (GNUNET_PeerIdentity));
+ }
- GNUNET_multi_hash_map_put (ctx->extended_neighbors,
- &peer->hashPubKey, neighbor,
- GNUNET_MultiHashMapOption_REPLACE);
+ GNUNET_multi_hash_map_put (ctx->extended_neighbors,
+ &peer->hashPubKey, neighbor,
+ GNUNET_MultiHashMapOption_REPLACE);
- GNUNET_DV_Heap_insert (&ctx->neighbor_max_heap, neighbor);
- GNUNET_DV_Heap_insert (&ctx->neighbor_min_heap, neighbor);
- }
- }
+ GNUNET_DV_Heap_insert (&ctx->neighbor_max_heap, neighbor);
+ GNUNET_DV_Heap_insert (&ctx->neighbor_min_heap, neighbor);
+ }
+ }
#ifdef DEBUG_DV
Modified: GNUnet/src/applications/dv/module/heap.c
===================================================================
--- GNUnet/src/applications/dv/module/heap.c 2009-01-20 22:49:01 UTC (rev
8140)
+++ GNUnet/src/applications/dv/module/heap.c 2009-01-20 22:54:23 UTC (rev
8141)
@@ -438,10 +438,6 @@
neighbor = root->traversal_pos->neighbor;
choice = GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, 2);
- GNUNET_GE_LOG (NULL,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER |
- GNUNET_GE_BULK, "Choice is %u\n",
- choice);
switch (choice)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8141 - GNUnet/src/applications/dv/module,
gnunet <=