diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-09-19 12:25:28 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-09-19 12:25:28 +0000 |
commit | 9daee8a187e78bd9e860f2f34729e80cc95f414c (patch) | |
tree | f059b5d84fc7bcf996b6e3e2fe9445fc47e89707 /src/ats-tests/perf_ats_logging.c | |
parent | 33d7922f5f3ebbf4239f105b7cf030f3e3cc7733 (diff) | |
download | gnunet-9daee8a187e78bd9e860f2f34729e80cc95f414c.tar.gz gnunet-9daee8a187e78bd9e860f2f34729e80cc95f414c.zip |
added logging frequency
Diffstat (limited to 'src/ats-tests/perf_ats_logging.c')
-rw-r--r-- | src/ats-tests/perf_ats_logging.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ats-tests/perf_ats_logging.c b/src/ats-tests/perf_ats_logging.c index 055ad7272..592c1070f 100644 --- a/src/ats-tests/perf_ats_logging.c +++ b/src/ats-tests/perf_ats_logging.c | |||
@@ -27,8 +27,6 @@ | |||
27 | #include "gnunet_util_lib.h" | 27 | #include "gnunet_util_lib.h" |
28 | #include "perf_ats.h" | 28 | #include "perf_ats.h" |
29 | 29 | ||
30 | #define LOGGING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 500) | ||
31 | |||
32 | #define THROUGHPUT_TEMPLATE "#!/usr/bin/gnuplot \n" \ | 30 | #define THROUGHPUT_TEMPLATE "#!/usr/bin/gnuplot \n" \ |
33 | "set datafile separator ';' \n" \ | 31 | "set datafile separator ';' \n" \ |
34 | "set title \"Throughput\" \n" \ | 32 | "set title \"Throughput\" \n" \ |
@@ -46,6 +44,7 @@ static GNUNET_SCHEDULER_TaskIdentifier log_task; | |||
46 | static int num_peers; | 44 | static int num_peers; |
47 | static int running; | 45 | static int running; |
48 | static char *name; | 46 | static char *name; |
47 | static struct GNUNET_TIME_Relative frequency; | ||
49 | 48 | ||
50 | /** | 49 | /** |
51 | * A single logging time step for a partner | 50 | * A single logging time step for a partner |
@@ -370,7 +369,7 @@ collect_log_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
370 | if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) | 369 | if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) |
371 | return; | 370 | return; |
372 | 371 | ||
373 | log_task = GNUNET_SCHEDULER_add_delayed (LOGGING_FREQUENCY, | 372 | log_task = GNUNET_SCHEDULER_add_delayed (frequency, |
374 | &collect_log_task, NULL); | 373 | &collect_log_task, NULL); |
375 | } | 374 | } |
376 | 375 | ||
@@ -410,7 +409,8 @@ perf_logging_stop () | |||
410 | } | 409 | } |
411 | 410 | ||
412 | void | 411 | void |
413 | perf_logging_start (char * testname, struct BenchmarkPeer *masters, int num_masters) | 412 | perf_logging_start (struct GNUNET_TIME_Relative log_frequency, |
413 | char * testname, struct BenchmarkPeer *masters, int num_masters) | ||
414 | { | 414 | { |
415 | int c_m; | 415 | int c_m; |
416 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, | 416 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, |
@@ -418,6 +418,7 @@ perf_logging_start (char * testname, struct BenchmarkPeer *masters, int num_mast | |||
418 | 418 | ||
419 | num_peers = num_masters; | 419 | num_peers = num_masters; |
420 | name = testname; | 420 | name = testname; |
421 | frequency = log_frequency; | ||
421 | 422 | ||
422 | lp = GNUNET_malloc (num_masters * sizeof (struct LoggingPeer)); | 423 | lp = GNUNET_malloc (num_masters * sizeof (struct LoggingPeer)); |
423 | 424 | ||