-try using gauger for memory measurements

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 43d60d6f260902f52416655f0080974cce22e947..de5bb8ac4510b65df548c2f795c536b2ca1d2e3e 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -500,6 +500,7 @@ EXTRA_DIST = \
   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 \

diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c
index 7b2c04407966c383df13c542da393400c7a63ac6..22068732d6e570e99038c2d82bdfadf1958a778d 100644 (file)
--- a/src/fs/perf_gnunet_service_fs_p2p.c
+++ b/src/fs/perf_gnunet_service_fs_p2p.c
@@ -298,7 +298,7 @@ static void
 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 @@ main (int argc, char *argv[])
   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 @@ main (int argc, char *argv[])
   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,

diff --git a/src/fs/perf_gnunet_service_fs_p2p.conf b/src/fs/perf_gnunet_service_fs_p2p.conf
new file mode 100644 (file)
index 0000000..c1f7b09
--- /dev/null
+++ b/src/fs/perf_gnunet_service_fs_p2p.conf
@@ -0,0 +1,6 @@
+@INCLUDE@ fs_test_lib_data.conf
+[PATHS]
+SERVICEHOME = /tmp/gnunet-fs-test-lib/
+
+[fs]
+GAUGER_HEAP = "2-peer 10 MB P2P download"