[GNUnet-SVN] r13295 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2010-10-19 11:30:28 +0200 (Tue, 19 Oct 2010)
New Revision: 13295

Modified:
   gnunet/src/fs/fs_test_lib.c
   gnunet/src/fs/gnunet-service-fs.c
   gnunet/src/fs/perf_gnunet_service_fs_p2p.c
Log:
stats

Modified: gnunet/src/fs/fs_test_lib.c
===================================================================
--- gnunet/src/fs/fs_test_lib.c 2010-10-19 07:22:06 UTC (rev 13294)
+++ gnunet/src/fs/fs_test_lib.c 2010-10-19 09:30:28 UTC (rev 13295)
@@ -581,7 +581,9 @@
   uint8_t *cbuf = buf;
   int mod;
 
-  for (pos=0;pos<max;pos++)
+  for (pos=0;pos<8;pos++)
+    cbuf[pos] = (uint8_t) (offset >> pos*8);
+  for (pos=8;pos<max;pos++)
     {
       mod = (255 - (offset / 1024 / 32));
       if (mod == 0)

Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c   2010-10-19 07:22:06 UTC (rev 13294)
+++ gnunet/src/fs/gnunet-service-fs.c   2010-10-19 09:30:28 UTC (rev 13295)
@@ -48,7 +48,7 @@
  * implementation of GAP, but can be disabled for performance evaluation of
  * the basic routing algorithm.
  */
-#define SUPPORT_DELAYS GNUNET_YES
+#define SUPPORT_DELAYS GNUNET_NO
 
 /**
  * Maximum number of outgoing messages we queue per peer.

Modified: gnunet/src/fs/perf_gnunet_service_fs_p2p.c
===================================================================
--- gnunet/src/fs/perf_gnunet_service_fs_p2p.c  2010-10-19 07:22:06 UTC (rev 
13294)
+++ gnunet/src/fs/perf_gnunet_service_fs_p2p.c  2010-10-19 09:30:28 UTC (rev 
13295)
@@ -37,7 +37,7 @@
 /**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 3)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 300)
 
 #define NUM_DAEMONS 2
 
@@ -92,6 +92,7 @@
     { "fs", "cummulative artificial delay introduced (ms)"},
     { "core", "# bytes decrypted"},
     { "core", "# bytes encrypted"},
+    { "core", "# transmissions delayed due to corking"},
     { "transport", "# bytes received via TCP"},
     { "transport", "# bytes transmitted via TCP"},
     { "datacache", "# bytes stored"},
@@ -120,7 +121,7 @@
 {
   struct StatMaster *sm = cls;
   fprintf (stderr,
-          "Peer %2u: %12s/%50s = %4llu\n",
+          "Peer %2u: %12s/%50s = %12llu\n",
           sm->daemon,
           subsystem,
           name,