diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-07-15 16:00:06 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-07-15 16:00:06 +0000 |
commit | da3c10044c05bf3ae6b8c5f63863fd2ea38476f6 (patch) | |
tree | 73cd03aa1b122a89e456abe353c493ffb90245ed /src/fs | |
parent | 2f3daa52becc3439f9f58dff10b1a2ed95a352db (diff) | |
download | gnunet-da3c10044c05bf3ae6b8c5f63863fd2ea38476f6.tar.gz gnunet-da3c10044c05bf3ae6b8c5f63863fd2ea38476f6.zip |
-try using gauger for memory measurements
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/Makefile.am | 1 | ||||
-rw-r--r-- | src/fs/perf_gnunet_service_fs_p2p.c | 11 | ||||
-rw-r--r-- | src/fs/perf_gnunet_service_fs_p2p.conf | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index 43d60d6f2..de5bb8ac4 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am | |||
@@ -500,6 +500,7 @@ EXTRA_DIST = \ | |||
500 | test_gnunet_fs_ns_data.conf \ | 500 | test_gnunet_fs_ns_data.conf \ |
501 | test_gnunet_fs_psd_data.conf \ | 501 | test_gnunet_fs_psd_data.conf \ |
502 | test_gnunet_fs_rec_data.conf \ | 502 | test_gnunet_fs_rec_data.conf \ |
503 | perf_gnunet_service_fs_p2p.conf \ | ||
503 | test_gnunet_fs_rec_data.tgz \ | 504 | test_gnunet_fs_rec_data.tgz \ |
504 | test_gnunet_fs_psd.py.in \ | 505 | test_gnunet_fs_psd.py.in \ |
505 | test_gnunet_fs_rec.py.in \ | 506 | 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 7b2c04407..22068732d 100644 --- a/src/fs/perf_gnunet_service_fs_p2p.c +++ b/src/fs/perf_gnunet_service_fs_p2p.c | |||
@@ -298,7 +298,7 @@ static void | |||
298 | run (void *cls, char *const *args, const char *cfgfile, | 298 | run (void *cls, char *const *args, const char *cfgfile, |
299 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 299 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
300 | { | 300 | { |
301 | GNUNET_FS_TEST_daemons_start ("fs_test_lib_data.conf", TIMEOUT, NUM_DAEMONS, | 301 | GNUNET_FS_TEST_daemons_start ("perf_gnunet_service_fs_p2p.conf", TIMEOUT, NUM_DAEMONS, |
302 | daemons, &do_connect, NULL); | 302 | daemons, &do_connect, NULL); |
303 | } | 303 | } |
304 | 304 | ||
@@ -309,10 +309,7 @@ main (int argc, char *argv[]) | |||
309 | char *const argvx[] = { | 309 | char *const argvx[] = { |
310 | "perf-gnunet-service-fs-p2p", | 310 | "perf-gnunet-service-fs-p2p", |
311 | "-c", | 311 | "-c", |
312 | "fs_test_lib_data.conf", | 312 | "perf_gnunet_service_fs_p2p.conf", |
313 | #if VERBOSE | ||
314 | "-L", "DEBUG", | ||
315 | #endif | ||
316 | NULL | 313 | NULL |
317 | }; | 314 | }; |
318 | struct GNUNET_GETOPT_CommandLineOption options[] = { | 315 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
@@ -321,11 +318,7 @@ main (int argc, char *argv[]) | |||
321 | progname = argv[0]; | 318 | progname = argv[0]; |
322 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/"); | 319 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/"); |
323 | GNUNET_log_setup ("perf_gnunet_service_fs_p2p_index", | 320 | GNUNET_log_setup ("perf_gnunet_service_fs_p2p_index", |
324 | #if VERBOSE | ||
325 | "DEBUG", | ||
326 | #else | ||
327 | "WARNING", | 321 | "WARNING", |
328 | #endif | ||
329 | NULL); | 322 | NULL); |
330 | GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx, | 323 | GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx, |
331 | "perf-gnunet-service-fs-p2p-index", "nohelp", options, | 324 | "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 index 000000000..c1f7b091a --- /dev/null +++ b/src/fs/perf_gnunet_service_fs_p2p.conf | |||
@@ -0,0 +1,6 @@ | |||
1 | @INCLUDE@ fs_test_lib_data.conf | ||
2 | [PATHS] | ||
3 | SERVICEHOME = /tmp/gnunet-fs-test-lib/ | ||
4 | |||
5 | [fs] | ||
6 | GAUGER_HEAP = "2-peer 10 MB P2P download" | ||