diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-04-24 12:20:58 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-04-24 12:20:58 +0000 |
commit | 4093220b27fdc8dcbe4240671ba76c803a8dbe9b (patch) | |
tree | 7ddb053be09b15f745dbbd9e5ea8b73774af616e /src/regex | |
parent | 7262570cdee2b0ad228e1d30959b7d5f1c816c58 (diff) | |
download | gnunet-4093220b27fdc8dcbe4240671ba76c803a8dbe9b.tar.gz gnunet-4093220b27fdc8dcbe4240671ba76c803a8dbe9b.zip |
- fix test timeout task: do collect stats on timeout
Diffstat (limited to 'src/regex')
-rw-r--r-- | src/regex/gnunet-regex-profiler.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c index ce0a2ecb1..d6c29a441 100644 --- a/src/regex/gnunet-regex-profiler.c +++ b/src/regex/gnunet-regex-profiler.c | |||
@@ -493,7 +493,7 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
493 | { | 493 | { |
494 | unsigned long i = (unsigned long) cls; | 494 | unsigned long i = (unsigned long) cls; |
495 | 495 | ||
496 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Aborting %lu...\n", i); | 496 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Aborting from line %lu...\n", i); |
497 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 497 | abort_task = GNUNET_SCHEDULER_NO_TASK; |
498 | result = GNUNET_SYSERR; | 498 | result = GNUNET_SYSERR; |
499 | if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) | 499 | if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) |
@@ -1118,10 +1118,8 @@ test_master (void *cls, | |||
1118 | peers[i].peer_handle = testbed_peers[i]; | 1118 | peers[i].peer_handle = testbed_peers[i]; |
1119 | } | 1119 | } |
1120 | GNUNET_SCHEDULER_add_now (&do_announce, NULL); | 1120 | GNUNET_SCHEDULER_add_now (&do_announce, NULL); |
1121 | abort_task = | 1121 | search_timeout_task = |
1122 | GNUNET_SCHEDULER_add_delayed (search_timeout_time, | 1122 | GNUNET_SCHEDULER_add_delayed (search_timeout_time, &search_timeout, NULL); |
1123 | &do_abort, | ||
1124 | (void*) __LINE__); | ||
1125 | } | 1123 | } |
1126 | 1124 | ||
1127 | 1125 | ||
@@ -1390,7 +1388,7 @@ main (int argc, char *const *argv) | |||
1390 | result = GNUNET_SYSERR; | 1388 | result = GNUNET_SYSERR; |
1391 | ret = | 1389 | ret = |
1392 | GNUNET_PROGRAM_run (argc, argv, | 1390 | GNUNET_PROGRAM_run (argc, argv, |
1393 | "gnunet-regex-profiler [OPTIONS] hosts-file policy-dir search-strings-file", | 1391 | "gnunet-regex-profiler", |
1394 | _("Profiler for regex"), | 1392 | _("Profiler for regex"), |
1395 | options, &run, NULL); | 1393 | options, &run, NULL); |
1396 | if (GNUNET_OK != ret) | 1394 | if (GNUNET_OK != ret) |