[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34216 - gnunet/src/dht
From: |
gnunet |
Subject: |
[GNUnet-SVN] r34216 - gnunet/src/dht |
Date: |
Sun, 24 Aug 2014 19:58:02 +0200 |
Author: supriti
Date: 2014-08-24 19:58:02 +0200 (Sun, 24 Aug 2014)
New Revision: 34216
Modified:
gnunet/src/dht/gnunet-service-xdht_neighbours.c
gnunet/src/dht/gnunet_dht_profiler.c
Log:
Code refactoring
Modified: gnunet/src/dht/gnunet-service-xdht_neighbours.c
===================================================================
--- gnunet/src/dht/gnunet-service-xdht_neighbours.c 2014-08-24 03:29:56 UTC
(rev 34215)
+++ gnunet/src/dht/gnunet-service-xdht_neighbours.c 2014-08-24 17:58:02 UTC
(rev 34216)
@@ -126,11 +126,6 @@
#define PREDECESSOR_FINGER_ID 64
/**
- * Wrap around in peer identity circle.
- */
-#define PEER_IDENTITES_WRAP_AROUND pow(2, 64) - 1
-
-/**
* FIXME: Its use only at 3 places check if you can remove it.
* To check if a finger is predecessor or not.
*/
@@ -1705,7 +1700,6 @@
peer1_value = GNUNET_ntohll (peer1_value);
peer2_value = GNUNET_ntohll (peer2_value);
- // TODO: Can use a simpler (to understand) idea here!
if (peer1_value == value)
{
return *peer1;
@@ -1715,32 +1709,31 @@
{
return *peer2;
}
-
- if (peer2_value < peer1_value)
+
+ if (value < peer1_value && peer1_value < peer2_value)
{
- if ((peer2_value < value) && (value < peer1_value))
- {
- return *peer1;
- }
- else if (((peer1_value < value) && (value < PEER_IDENTITES_WRAP_AROUND)) ||
- ((0 < value) && (value < peer2_value)))
- {
- return *peer2;
- }
+ return *peer1;
+ }
+ else if (value < peer2_value && peer2_value < peer1_value)
+ {
+ return *peer2;
}
-
- //if (peer1_value < peer2_value)
- //{
- if ((peer1_value < value) && (value < peer2_value))
- {
- return *peer2;
- }
- //else if (((peer2_value < value) && (value < PEER_IDENTITES_WRAP_AROUND))
||
- // ((0 < value) && (value < peer1_value)))
- //{
- return *peer1;
- //}
- // }
+ else if (peer1_value < value && value < peer2_value)
+ {
+ return *peer2;
+ }
+ else if (peer2_value < value && value < peer1_value)
+ {
+ return *peer1;
+ }
+ else if (peer1_value < peer2_value && peer2_value < value)
+ {
+ return *peer1;
+ }
+ else // if (peer2_value < peer1_value && peer1_value < value)
+ {
+ return *peer2;
+ }
}
@@ -1764,37 +1757,40 @@
peer1_value = GNUNET_ntohll (peer1_value);
peer2_value = GNUNET_ntohll (peer2_value);
- if (peer1_value == value)
+ if (peer1_value == value)
+ {
return *peer1;
+ }
if (peer2_value == value)
+ {
return *peer2;
-
- if (peer1_value < peer2_value)
+ }
+
+ if (value < peer1_value && peer1_value < peer2_value)
{
- if ((peer1_value < value) && (value < peer2_value))
- {
- return *peer1;
- }
- else if (((peer2_value < value) && (value < PEER_IDENTITES_WRAP_AROUND)) ||
- ((PEER_IDENTITES_WRAP_AROUND > value) && (value < peer1_value)))
- {
- return *peer2;
- }
+ return *peer2;
+ }
+ else if (value < peer2_value && peer2_value < peer1_value)
+ {
+ return *peer1;
}
-
- // if (peer2_value < peer1_value)
- //{
- if ((peer2_value < value) && (value < peer1_value))
- {
- return *peer2;
- }
- //else if (((peer1_value < value) && (value < PEER_IDENTITES_WRAP_AROUND))
||
- // ((PEER_IDENTITES_WRAP_AROUND > value) && (value < peer2_value)))
- //{
- return *peer1;
- //}
- // }
+ else if (peer1_value < value && value < peer2_value)
+ {
+ return *peer1;
+ }
+ else if (peer2_value < value && value < peer1_value)
+ {
+ return *peer2;
+ }
+ else if (peer1_value < peer2_value && peer2_value < value)
+ {
+ return *peer2;
+ }
+ else // if (peer2_value < peer1_value && peer1_value < value)
+ {
+ return *peer1;
+ }
}
#if 0
@@ -2089,7 +2085,7 @@
* @return Updated closest_peer
*/
static struct Closest_Peer
-init_current_successor (struct GNUNET_PeerIdentity my_identity,
+init_closest_peer (struct GNUNET_PeerIdentity my_identity,
uint64_t destination_finger_value,
unsigned int is_predecessor)
{
@@ -2123,9 +2119,9 @@
struct Closest_Peer current_closest_peer;
/* Initialize current_successor to my_identity. */
- current_closest_peer = init_current_successor (my_identity,
- destination_finger_value,
- is_predecessor);
+ current_closest_peer = init_closest_peer (my_identity,
+ destination_finger_value,
+ is_predecessor);
/* Compare each friend entry with current_successor and update
current_successor
* with friend if its closest. */
Modified: gnunet/src/dht/gnunet_dht_profiler.c
===================================================================
--- gnunet/src/dht/gnunet_dht_profiler.c 2014-08-24 03:29:56 UTC (rev
34215)
+++ gnunet/src/dht/gnunet_dht_profiler.c 2014-08-24 17:58:02 UTC (rev
34216)
@@ -913,7 +913,7 @@
successor_peer_hashmap = GNUNET_CONTAINER_multihashmap_create (num_peers,
GNUNET_NO);
-
+ //TODO:Check if comparison is correct.
if ((start_val == val) && (count == num_peers))
{
DEBUG("CIRCLE COMPLETED after %u tries", tries);
@@ -1257,7 +1257,7 @@
delay_stats = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30);
delay_put = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1);
delay_get = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 1);
- timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 1);
+ timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 3);
replication = 1; /* default replication */
rc = 0;
if (GNUNET_OK !=
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34216 - gnunet/src/dht,
gnunet <=