fixes-gaugering

diff --git a/src/fs/gnunet-service-fs.h b/src/fs/gnunet-service-fs.h
index c4a3d4bb9b2db397214d33923ef438c638a6d7b7..f04d063f7f2e45a9a7538a3e5d5c3e4e493d72c6 100644 (file)
--- a/src/fs/gnunet-service-fs.h
+++ b/src/fs/gnunet-service-fs.h
@@ -33,7 +33,7 @@
 #include "gnunet_block_lib.h"
 #include "fs.h"
 
-#define DEBUG_FS GNUNET_YES
+#define DEBUG_FS GNUNET_NO
 
 
 /**

diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c
index 969e83bf9b4e26dac88034426d7d8b703535492f..44e2cc48bca0508c7c236d1c9afb7534d2e0d8a9 100644 (file)
--- a/src/fs/test_fs_download.c
+++ b/src/fs/test_fs_download.c
@@ -28,6 +28,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_fs_service.h"
+#include <gauger.h>
 
 #define VERBOSE GNUNET_NO
 
@@ -151,6 +152,10 @@ progress_cb (void *cls,
     case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
       printf ("Publishing complete, %llu kbps.\n",
              (unsigned long long) (FILESIZE * 1000LL / (1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024LL));
+      GAUGER ("FS",
+             "Publishing speed",
+             (unsigned long long) (FILESIZE * 1000LL / (1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024LL),
+             "kb/s");      
       fn = GNUNET_DISK_mktemp ("gnunet-download-test-dst");
       start = GNUNET_TIME_absolute_get ();
       download = GNUNET_FS_download_start (fs,
@@ -168,6 +173,10 @@ progress_cb (void *cls,
     case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
       printf ("Download complete,  %llu kbps.\n",
              (unsigned long long) (FILESIZE * 1000LL / (1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024LL));
+      GAUGER ("FS",
+             "Local download speed",
+             (unsigned long long) (FILESIZE * 1000LL / (1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024LL),
+             "kb/s");      
       GNUNET_SCHEDULER_add_now (&abort_download_task,
                                NULL);
       break;

diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf
index 49389526d368120f9874042b51fa78ab62544ecc..0a7eb311aaef7d4f9da85c4e8b74e1383cf877b5 100644 (file)
--- a/src/fs/test_fs_download_data.conf
+++ b/src/fs/test_fs_download_data.conf
@@ -37,7 +37,7 @@ HOSTNAME = localhost
 PORT = 42471
 HOSTNAME = localhost
 ACTIVEMIGRATION = NO
-DEBUG = YES
+# DEBUG = YES
 #PREFIX = valgrind --tool=memcheck --leak-check=yes
 #BINARY = /home/grothoff/bin/gnunet-service-fs