diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-05-24 11:17:39 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-05-24 11:17:39 +0000 |
commit | 165db0c132dd7cb0cecfd274b3bf07f6279392a4 (patch) | |
tree | 5114618252e0874cc7eb8048c052992b4ec1f890 /src/regex/gnunet-regex-profiler.c | |
parent | e1fe9d8efebd8aa80d4368e9c97a89fe0dff441e (diff) | |
download | gnunet-165db0c132dd7cb0cecfd274b3bf07f6279392a4.tar.gz gnunet-165db0c132dd7cb0cecfd274b3bf07f6279392a4.zip |
- use testbed SETUP_TIME + 1 min margin for aborting
Diffstat (limited to 'src/regex/gnunet-regex-profiler.c')
-rw-r--r-- | src/regex/gnunet-regex-profiler.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c index 60ced866d..29b86e1b0 100644 --- a/src/regex/gnunet-regex-profiler.c +++ b/src/regex/gnunet-regex-profiler.c | |||
@@ -1251,6 +1251,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
1251 | { | 1251 | { |
1252 | unsigned int nsearchstrs; | 1252 | unsigned int nsearchstrs; |
1253 | unsigned int i; | 1253 | unsigned int i; |
1254 | struct GNUNET_TIME_realtive abort_time; | ||
1254 | 1255 | ||
1255 | in_shutdown = GNUNET_NO; | 1256 | in_shutdown = GNUNET_NO; |
1256 | 1257 | ||
@@ -1388,9 +1389,17 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
1388 | NULL, /* master_controller_cb cls */ | 1389 | NULL, /* master_controller_cb cls */ |
1389 | &test_master, | 1390 | &test_master, |
1390 | NULL); /* test_master cls */ | 1391 | NULL); /* test_master cls */ |
1392 | if (GNUNET_OK != | ||
1393 | GNUNET_CONFIGURATION_get_value_time (cfg, "TESTBED", | ||
1394 | "SETUP_TIME", | ||
1395 | &abort_time)) | ||
1396 | { | ||
1397 | abort_time = | ||
1398 | GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15); | ||
1399 | } | ||
1400 | abort_time = GNUNET_TIME_relative_add (abort_time, GNUNET_TIME_UNIT_MINUTES); | ||
1391 | abort_task = | 1401 | abort_task = |
1392 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 1402 | GNUNET_SCHEDULER_add_delayed (abort_time, |
1393 | (GNUNET_TIME_UNIT_MINUTES, 15), | ||
1394 | &do_abort, | 1403 | &do_abort, |
1395 | (void*) __LINE__); | 1404 | (void*) __LINE__); |
1396 | } | 1405 | } |