[GNUnet-SVN] r34228 - gnunet/src/dht

[gnunet]

Author: supriti
Date: 2014-08-27 21:21:10 +0200 (Wed, 27 Aug 2014)
New Revision: 34228

Modified:
   gnunet/src/dht/gnunet-service-xdht_neighbours.c
   gnunet/src/dht/gnunet_dht_profiler.c
   gnunet/src/dht/gnunet_dht_r5n_profiler.c
Log:
Exponential backoff 


Modified: gnunet/src/dht/gnunet-service-xdht_neighbours.c
===================================================================
--- gnunet/src/dht/gnunet-service-xdht_neighbours.c     2014-08-26 22:55:42 UTC 
(rev 34227)
+++ gnunet/src/dht/gnunet-service-xdht_neighbours.c     2014-08-27 19:21:10 UTC 
(rev 34228)
@@ -957,6 +957,10 @@
  */
 static unsigned int total_fingers_found;
 
+/**
+ * Number of times we found the same successor. 
+ */
+static unsigned int successor_times;
 
 /**
  * Called when core is ready to send a message we asked for
@@ -5058,6 +5062,16 @@
       GNUNET_STATISTICS_set (GDS_stats, key, succ, 0);
       GNUNET_free (key);
     }
+    
+    if(0 == successor_times)
+    {
+      verify_successor_next_send_time = 
+              GNUNET_TIME_STD_BACKOFF (verify_successor_next_send_time);
+    }
+    if (0 != successor_times)
+      successor_times--;
+    
+    
     if (send_verify_successor_task == GNUNET_SCHEDULER_NO_TASK)
       send_verify_successor_task = 
               GNUNET_SCHEDULER_add_delayed(verify_successor_next_send_time,
@@ -6059,7 +6073,7 @@
   //TODO: check size of this peer map? 
   friend_peermap = GNUNET_CONTAINER_multipeermap_create (256, GNUNET_NO);
   finger_table_init ();
-  
+  successor_times = 10;
   find_finger_trail_task_next_send_time.rel_value_us =
       DHT_FIND_FINGER_TRAIL_INTERVAL.rel_value_us +
       GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,

Modified: gnunet/src/dht/gnunet_dht_profiler.c
===================================================================
--- gnunet/src/dht/gnunet_dht_profiler.c        2014-08-26 22:55:42 UTC (rev 
34227)
+++ gnunet/src/dht/gnunet_dht_profiler.c        2014-08-27 19:21:10 UTC (rev 
34228)
@@ -461,8 +461,6 @@
    static const char *s_sent = "# Bytes transmitted to other peers";
    static const char *s_recv = "# Bytes received from other peers";
 
-   DEBUG("inside bandwidth_stats_iterator()\n");
-   
    if (0 == strncmp (s_sent, name, strlen (s_sent)))
      outgoing_bandwidth = outgoing_bandwidth + value;
    else if (0 == strncmp(s_recv, name, strlen (s_recv)))
@@ -518,8 +516,6 @@
   GNUNET_TESTBED_operation_done (ctx->op);
   ctx->op = NULL;
 
-  DEBUG("inside cancel_get()");
-  
   /* If profiling is complete, summarize */
   if (n_active == n_gets_fail + n_gets_ok)
   {
@@ -577,9 +573,9 @@
   GNUNET_TESTBED_operation_done (ctx->op);
   ctx->op = NULL;
   
-  total_put_path_length = total_put_path_length + put_path_length;
-  total_get_path_length = total_get_path_length + get_path_length;
-  
+  total_put_path_length = total_put_path_length + (double)put_path_length;
+  total_get_path_length = total_get_path_length + (double)get_path_length;
+  DEBUG ("total_put_path_length = %f,put_path \n",total_put_path_length);
   /* Summarize if profiling is complete */
   if (n_active == n_gets_fail + n_gets_ok)
   {
@@ -704,7 +700,7 @@
   DEBUG ("PUT_REQUEST_START key %s \n", GNUNET_h2s((struct GNUNET_HashCode 
*)ac->put_data));
   ac->dht_put = GNUNET_DHT_put (ac->dht, &ac->hash,
                                 replication,
-                                GNUNET_DHT_RO_NONE,
+                                GNUNET_DHT_RO_RECORD_ROUTE,
                                 GNUNET_BLOCK_TYPE_TEST,
                                 ac->put_data_size,
                                 ac->put_data,
@@ -750,7 +746,6 @@
   {
     struct GNUNET_TIME_Relative peer_delay_put;
     peer_delay_put.rel_value_us =
-      delay_put.rel_value_us +
       GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
                                 delay_put.rel_value_us);
     ac->delay_task = GNUNET_SCHEDULER_add_delayed (peer_delay_put, 
&delayed_put, ac);
@@ -936,7 +931,7 @@
                                                  NULL));
   
   successor_peer_hashmap = GNUNET_CONTAINER_multihashmap_create (num_peers, 
-                                                                    GNUNET_NO);
+                                                                 GNUNET_NO);
   //TODO:Check if comparison is correct. 
   if ((start_val == val) && (count == num_peers))
   {

Modified: gnunet/src/dht/gnunet_dht_r5n_profiler.c
===================================================================
--- gnunet/src/dht/gnunet_dht_r5n_profiler.c    2014-08-26 22:55:42 UTC (rev 
34227)
+++ gnunet/src/dht/gnunet_dht_r5n_profiler.c    2014-08-27 19:21:10 UTC (rev 
34228)
@@ -602,6 +602,7 @@
   GNUNET_assert (NULL != ac->dht);
   GNUNET_assert (ac->dht == op_result);
   GNUNET_DHT_disconnect (ac->dht);
+  ac->dht = NULL;
   n_dht--;
   if (0 == n_dht)
     GNUNET_SCHEDULER_shutdown ();