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

[gnunet]

Author: grothoff
Date: 2012-07-15 18:00:06 +0200 (Sun, 15 Jul 2012)
New Revision: 22693

Added:
   gnunet/src/fs/perf_gnunet_service_fs_p2p.conf
Modified:
   gnunet/src/fs/Makefile.am
   gnunet/src/fs/perf_gnunet_service_fs_p2p.c
Log:
-try using gauger for memory measurements

Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am   2012-07-15 15:59:55 UTC (rev 22692)
+++ gnunet/src/fs/Makefile.am   2012-07-15 16:00:06 UTC (rev 22693)
@@ -500,6 +500,7 @@
   test_gnunet_fs_ns_data.conf \
   test_gnunet_fs_psd_data.conf \
   test_gnunet_fs_rec_data.conf \
+  perf_gnunet_service_fs_p2p.conf \
   test_gnunet_fs_rec_data.tgz \
   test_gnunet_fs_psd.py.in \
   test_gnunet_fs_rec.py.in \

Modified: gnunet/src/fs/perf_gnunet_service_fs_p2p.c
===================================================================
--- gnunet/src/fs/perf_gnunet_service_fs_p2p.c  2012-07-15 15:59:55 UTC (rev 
22692)
+++ gnunet/src/fs/perf_gnunet_service_fs_p2p.c  2012-07-15 16:00:06 UTC (rev 
22693)
@@ -298,7 +298,7 @@
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  GNUNET_FS_TEST_daemons_start ("fs_test_lib_data.conf", TIMEOUT, NUM_DAEMONS,
+  GNUNET_FS_TEST_daemons_start ("perf_gnunet_service_fs_p2p.conf", TIMEOUT, 
NUM_DAEMONS,
                                 daemons, &do_connect, NULL);
 }
 
@@ -309,10 +309,7 @@
   char *const argvx[] = {
     "perf-gnunet-service-fs-p2p",
     "-c",
-    "fs_test_lib_data.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
+    "perf_gnunet_service_fs_p2p.conf",
     NULL
   };
   struct GNUNET_GETOPT_CommandLineOption options[] = {
@@ -321,11 +318,7 @@
   progname = argv[0];
   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
   GNUNET_log_setup ("perf_gnunet_service_fs_p2p_index",
-#if VERBOSE
-                    "DEBUG",
-#else
                     "WARNING",
-#endif
                     NULL);
   GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx,
                       "perf-gnunet-service-fs-p2p-index", "nohelp", options,

Added: gnunet/src/fs/perf_gnunet_service_fs_p2p.conf
===================================================================
--- gnunet/src/fs/perf_gnunet_service_fs_p2p.conf                               
(rev 0)
+++ gnunet/src/fs/perf_gnunet_service_fs_p2p.conf       2012-07-15 16:00:06 UTC 
(rev 22693)
@@ -0,0 +1,6 @@
address@hidden@ fs_test_lib_data.conf
+[PATHS]
+SERVICEHOME = /tmp/gnunet-fs-test-lib/
+
+[fs]
+GAUGER_HEAP = "2-peer 10 MB P2P download"