projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
writign plots
[oweals/gnunet.git]
/
src
/
ats-tests
/
ats-testing-experiment.c
diff --git
a/src/ats-tests/ats-testing-experiment.c
b/src/ats-tests/ats-testing-experiment.c
index 54c7675d7d09f93db321675332688a6b1728ebb8..d55adc2d74e5d9ceb07c37fa1292c8902967af9a 100644
(file)
--- a/
src/ats-tests/ats-testing-experiment.c
+++ b/
src/ats-tests/ats-testing-experiment.c
@@
-259,6
+259,12
@@
timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK;
fprintf (stderr, "Experiment timeout!\n");
e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK;
fprintf (stderr, "Experiment timeout!\n");
+ if (GNUNET_SCHEDULER_NO_TASK != e->episode_timeout_task)
+ {
+ e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_SCHEDULER_cancel (e->episode_timeout_task);
+ }
+
e->e_done_cb (e, GNUNET_TIME_absolute_get_duration(e->start_time),
GNUNET_SYSERR);
}
e->e_done_cb (e, GNUNET_TIME_absolute_get_duration(e->start_time),
GNUNET_SYSERR);
}
@@
-319,7
+325,8
@@
timeout_episode (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
{
struct Experiment *e = cls;
e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK;
{
struct Experiment *e = cls;
e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK;
- e->ep_done_cb (e->cur);
+ if (NULL != e->ep_done_cb)
+ e->ep_done_cb (e->cur);
/* Scheduling next */
e->cur = e->cur->next;
/* Scheduling next */
e->cur = e->cur->next;