From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 19 Oct 2010 09:30:28 +0000 (+0000)
Subject: stats
X-Git-Tag: initial-import-from-subversion-38251~20048
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5ecf0c3e1df10fdce2dbae9efc75d59a13aefb58;p=oweals%2Fgnunet.git

stats
---

diff --git a/src/fs/fs_test_lib.c b/src/fs/fs_test_lib.c
index 2f40b52bc..b0776e736 100644
--- a/src/fs/fs_test_lib.c
+++ b/src/fs/fs_test_lib.c
@@ -581,7 +581,9 @@ file_generator (void *cls,
   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)
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index ad1fa4475..23ddf60c6 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -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.
diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c
index 70e7cdb31..0b66150db 100644
--- a/src/fs/perf_gnunet_service_fs_p2p.c
+++ b/src/fs/perf_gnunet_service_fs_p2p.c
@@ -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 @@ static struct StatValues stats[] =
     { "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 @@ print_stat (void *cls,
 {
   struct StatMaster *sm = cls;
   fprintf (stderr,
-	   "Peer %2u: %12s/%50s = %4llu\n",
+	   "Peer %2u: %12s/%50s = %12llu\n",
 	   sm->daemon,
 	   subsystem,
 	   name,