[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29416 - gnunet/src/ats-tests
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29416 - gnunet/src/ats-tests |
Date: |
Thu, 19 Sep 2013 14:25:28 +0200 |
Author: wachs
Date: 2013-09-19 14:25:28 +0200 (Thu, 19 Sep 2013)
New Revision: 29416
Modified:
gnunet/src/ats-tests/perf_ats.c
gnunet/src/ats-tests/perf_ats.h
gnunet/src/ats-tests/perf_ats_logging.c
Log:
added logging frequency
Modified: gnunet/src/ats-tests/perf_ats.c
===================================================================
--- gnunet/src/ats-tests/perf_ats.c 2013-09-19 12:05:35 UTC (rev 29415)
+++ gnunet/src/ats-tests/perf_ats.c 2013-09-19 12:25:28 UTC (rev 29416)
@@ -151,6 +151,11 @@
static struct GNUNET_TIME_Relative perf_duration;
/**
+ * Logging frequency
+ */
+static struct GNUNET_TIME_Relative log_frequency;
+
+/**
* Benchmark state
*/
static struct BenchmarkState state;
@@ -456,7 +461,7 @@
mps[c_m].ats_task = GNUNET_SCHEDULER_add_now (&ats_pref_task, &mps[c_m]);
}
if (GNUNET_YES == logging)
- perf_logging_start (testname, mps, num_masters);
+ perf_logging_start (log_frequency, testname, mps, num_masters);
}
@@ -1229,6 +1234,26 @@
logging = GNUNET_YES;
}
+ if (GNUNET_YES == logging)
+ {
+ for (c = 0; c < (argc - 1); c++)
+ {
+ if (0 == strcmp (argv[c], "-f"))
+ break;
+ }
+ if (c < argc - 1)
+ {
+ if (GNUNET_OK != GNUNET_STRINGS_fancy_time_to_relative (argv[c + 1],
&log_frequency))
+ fprintf (stderr, "Failed to parse duration `%s'\n", argv[c + 1]);
+ }
+ else
+ {
+ log_frequency = LOGGING_FREQUENCY;
+ }
+ fprintf (stderr, "Using log frequency %llu ms\n",
+ (unsigned long long) (log_frequency.rel_value_us) / (1000));
+ }
+
GNUNET_asprintf (&testname, "%s_%s_%s",solver, comm_name, pref_str);
if (num_slaves < num_masters)
Modified: gnunet/src/ats-tests/perf_ats.h
===================================================================
--- gnunet/src/ats-tests/perf_ats.h 2013-09-19 12:05:35 UTC (rev 29415)
+++ gnunet/src/ats-tests/perf_ats.h 2013-09-19 12:25:28 UTC (rev 29416)
@@ -31,6 +31,7 @@
#define TEST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
30)
#define BENCHMARK_DURATION GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10)
+#define LOGGING_FREQUENCY GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MILLISECONDS, 500)
#define TESTNAME_PREFIX "perf_ats_"
#define DEFAULT_SLAVES_NUM 3
#define DEFAULT_MASTERS_NUM 1
@@ -218,7 +219,8 @@
perf_logging_stop ();
void
-perf_logging_start (char * testname, struct BenchmarkPeer *masters, int
num_masters);
+perf_logging_start (struct GNUNET_TIME_Relative log_frequency,
+ char * testname, struct BenchmarkPeer *masters, int num_masters);
/* end of file perf_ats.h */
Modified: gnunet/src/ats-tests/perf_ats_logging.c
===================================================================
--- gnunet/src/ats-tests/perf_ats_logging.c 2013-09-19 12:05:35 UTC (rev
29415)
+++ gnunet/src/ats-tests/perf_ats_logging.c 2013-09-19 12:25:28 UTC (rev
29416)
@@ -27,8 +27,6 @@
#include "gnunet_util_lib.h"
#include "perf_ats.h"
-#define LOGGING_FREQUENCY GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MILLISECONDS, 500)
-
#define THROUGHPUT_TEMPLATE "#!/usr/bin/gnuplot \n" \
"set datafile separator ';' \n" \
"set title \"Throughput\" \n" \
@@ -46,6 +44,7 @@
static int num_peers;
static int running;
static char *name;
+static struct GNUNET_TIME_Relative frequency;
/**
* A single logging time step for a partner
@@ -370,7 +369,7 @@
if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
return;
- log_task = GNUNET_SCHEDULER_add_delayed (LOGGING_FREQUENCY,
+ log_task = GNUNET_SCHEDULER_add_delayed (frequency,
&collect_log_task, NULL);
}
@@ -410,7 +409,8 @@
}
void
-perf_logging_start (char * testname, struct BenchmarkPeer *masters, int
num_masters)
+perf_logging_start (struct GNUNET_TIME_Relative log_frequency,
+ char * testname, struct BenchmarkPeer *masters, int num_masters)
{
int c_m;
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
@@ -418,6 +418,7 @@
num_peers = num_masters;
name = testname;
+ frequency = log_frequency;
lp = GNUNET_malloc (num_masters * sizeof (struct LoggingPeer));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29416 - gnunet/src/ats-tests,
gnunet <=