gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: gnunet
Subject: [GNUnet-SVN] r17109 - gnunet/src/dht
Date: Thu, 29 Sep 2011 16:56:32 +0200

Author: grothoff
Date: 2011-09-29 16:56:32 +0200 (Thu, 29 Sep 2011)
New Revision: 17109

Modified:
   gnunet/src/dht/test_dht_multipeer.c
   gnunet/src/dht/test_dht_multipeer_data.conf
Log:
better reporting

Modified: gnunet/src/dht/test_dht_multipeer.c
===================================================================
--- gnunet/src/dht/test_dht_multipeer.c 2011-09-29 14:55:29 UTC (rev 17108)
+++ gnunet/src/dht/test_dht_multipeer.c 2011-09-29 14:56:32 UTC (rev 17109)
@@ -373,17 +373,20 @@
 #if PATH_TRACKING
   if (put_path != NULL)
   {
-    fprintf (stderr, "PUT Path: ");
+    fprintf (stderr, "PUT (%u) Path: ",
+            test_get->uid);
     for (i = 0; i<put_path_length; i++)
       fprintf (stderr, "%s%s", i == 0 ? "" : "->", GNUNET_i2s (&put_path[i]));
     fprintf (stderr, "\n");
   }
   if (get_path != NULL)
   {
-    fprintf (stderr, "GET Path: ");
+    fprintf (stderr, "GET (%u) Path: ",
+            test_get->uid);
     for (i = 0; i < get_path_length; i++)
       fprintf (stderr, "%s%s", i == 0 ? "" : "->", GNUNET_i2s (&get_path[i]));
-    fprintf (stderr, "\n");
+    fprintf (stderr, "->%s\n",
+            GNUNET_i2s (&test_get->daemon->id));
   }
 #endif
 
@@ -395,7 +398,6 @@
   }
   else
   {
-    fprintf (stderr, "GET successful!\n");
     gets_completed++;
     test_get->succeeded = GNUNET_YES;
   }
@@ -500,6 +502,9 @@
 
   GNUNET_assert (test_put->dht_handle != NULL);
   outstanding_puts++;
+  fprintf (stderr, "PUT %u at `%s'\n",
+          test_put->uid,
+          GNUNET_i2s (&test_put->daemon->id));
   GNUNET_DHT_put (test_put->dht_handle, &key, 1,
                   route_option, GNUNET_BLOCK_TYPE_TEST, sizeof (data), data,
                   GNUNET_TIME_UNIT_FOREVER_ABS, GNUNET_TIME_UNIT_FOREVER_REL,
@@ -524,7 +529,6 @@
 {
   unsigned long long i;
   unsigned long long j;
-  uint32_t temp_daemon;
   struct TestPutContext *test_put;
   struct TestGetContext *test_get;
 
@@ -568,8 +572,7 @@
       {
        test_get = GNUNET_malloc (sizeof (struct TestGetContext));
        test_get->uid = i;
-       temp_daemon = j;
-       test_get->daemon = GNUNET_TESTING_daemon_get (pg, temp_daemon);
+       test_get->daemon = GNUNET_TESTING_daemon_get (pg, j);
        test_get->next = all_gets;
        all_gets = test_get;
       }

Modified: gnunet/src/dht/test_dht_multipeer_data.conf
===================================================================
--- gnunet/src/dht/test_dht_multipeer_data.conf 2011-09-29 14:55:29 UTC (rev 
17108)
+++ gnunet/src/dht/test_dht_multipeer_data.conf 2011-09-29 14:56:32 UTC (rev 
17109)
@@ -83,6 +83,9 @@
 TOPOLOGY = FROM_FILE
 CONNECT_TOPOLOGY = NONE
 TOPOLOGY_FILE = multipeer_topo.dat
+MAX_CONCURRENT_SSH = 1
+PEERGROUP_TIMEOUT = 10000
+USE_PROGRESSBARS = YES
 #CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET
 #CONNECT_TOPOLOGY_OPTION_MODIFIER = 2
 #LOGNMODIFIER = .65




reply via email to

[Prev in Thread] Current Thread [Next in Thread]