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

[gnunet]

Author: grothoff
Date: 2011-03-25 10:21:30 +0100 (Fri, 25 Mar 2011)
New Revision: 14717

Modified:
   gnunet/src/fs/gnunet-service-fs.h
   gnunet/src/fs/test_fs_download.c
   gnunet/src/fs/test_fs_download_data.conf
Log:
fixes-gaugering

Modified: gnunet/src/fs/gnunet-service-fs.h
===================================================================
--- gnunet/src/fs/gnunet-service-fs.h   2011-03-25 08:49:47 UTC (rev 14716)
+++ gnunet/src/fs/gnunet-service-fs.h   2011-03-25 09:21:30 UTC (rev 14717)
@@ -33,7 +33,7 @@
 #include "gnunet_block_lib.h"
 #include "fs.h"
 
-#define DEBUG_FS GNUNET_YES
+#define DEBUG_FS GNUNET_NO
 
 
 /**

Modified: gnunet/src/fs/test_fs_download.c
===================================================================
--- gnunet/src/fs/test_fs_download.c    2011-03-25 08:49:47 UTC (rev 14716)
+++ gnunet/src/fs/test_fs_download.c    2011-03-25 09:21:30 UTC (rev 14717)
@@ -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 @@
     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 @@
     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;

Modified: gnunet/src/fs/test_fs_download_data.conf
===================================================================
--- gnunet/src/fs/test_fs_download_data.conf    2011-03-25 08:49:47 UTC (rev 
14716)
+++ gnunet/src/fs/test_fs_download_data.conf    2011-03-25 09:21:30 UTC (rev 
14717)
@@ -37,7 +37,7 @@
 PORT = 42471
 HOSTNAME = localhost
 ACTIVEMIGRATION = NO
-DEBUG = YES
+# DEBUG = YES
 #PREFIX = valgrind --tool=memcheck --leak-check=yes
 #BINARY = /home/grothoff/bin/gnunet-service-fs