aboutsummaryrefslogtreecommitdiff
path: root/src/ats-tests/gnunet-solver-eval.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ats-tests/gnunet-solver-eval.c')
-rw-r--r--src/ats-tests/gnunet-solver-eval.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ats-tests/gnunet-solver-eval.c b/src/ats-tests/gnunet-solver-eval.c
index 9432f429d..91185f645 100644
--- a/src/ats-tests/gnunet-solver-eval.c
+++ b/src/ats-tests/gnunet-solver-eval.c
@@ -422,13 +422,13 @@ static void
422timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc) 422timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
423{ 423{
424 struct Experiment *e = cls; 424 struct Experiment *e = cls;
425 e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK; 425 e->experiment_timeout_task = NULL;
426 fprintf (stderr, "Experiment timeout!\n"); 426 fprintf (stderr, "Experiment timeout!\n");
427 427
428 if (GNUNET_SCHEDULER_NO_TASK != e->episode_timeout_task) 428 if (NULL != e->episode_timeout_task)
429 { 429 {
430 GNUNET_SCHEDULER_cancel (e->episode_timeout_task); 430 GNUNET_SCHEDULER_cancel (e->episode_timeout_task);
431 e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK; 431 e->episode_timeout_task = NULL;
432 } 432 }
433 433
434 e->e_done_cb (e, GNUNET_TIME_absolute_get_duration(e->start_time), 434 e->e_done_cb (e, GNUNET_TIME_absolute_get_duration(e->start_time),
@@ -588,7 +588,7 @@ static void
588timeout_episode (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc) 588timeout_episode (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
589{ 589{
590 struct Experiment *e = cls; 590 struct Experiment *e = cls;
591 e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK; 591 e->episode_timeout_task = NULL;
592 if (NULL != e->ep_done_cb) 592 if (NULL != e->ep_done_cb)
593 e->ep_done_cb (e->cur); 593 e->ep_done_cb (e->cur);
594 594
@@ -598,10 +598,10 @@ timeout_episode (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
598 { 598 {
599 /* done */ 599 /* done */
600 fprintf (stderr, "Last episode done!\n"); 600 fprintf (stderr, "Last episode done!\n");
601 if (GNUNET_SCHEDULER_NO_TASK != e->experiment_timeout_task) 601 if (NULL != e->experiment_timeout_task)
602 { 602 {
603 GNUNET_SCHEDULER_cancel (e->experiment_timeout_task); 603 GNUNET_SCHEDULER_cancel (e->experiment_timeout_task);
604 e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK; 604 e->experiment_timeout_task = NULL;
605 } 605 }
606 e->e_done_cb (e, GNUNET_TIME_absolute_get_duration(e->start_time), GNUNET_OK); 606 e->e_done_cb (e, GNUNET_TIME_absolute_get_duration(e->start_time), GNUNET_OK);
607 return; 607 return;
@@ -738,15 +738,15 @@ GNUNET_ATS_solvers_experimentation_load (char *filename)
738void 738void
739GNUNET_ATS_solvers_experimentation_stop (struct Experiment *e) 739GNUNET_ATS_solvers_experimentation_stop (struct Experiment *e)
740{ 740{
741 if (GNUNET_SCHEDULER_NO_TASK != e->experiment_timeout_task) 741 if (NULL != e->experiment_timeout_task)
742 { 742 {
743 GNUNET_SCHEDULER_cancel (e->experiment_timeout_task); 743 GNUNET_SCHEDULER_cancel (e->experiment_timeout_task);
744 e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK; 744 e->experiment_timeout_task = NULL;
745 } 745 }
746 if (GNUNET_SCHEDULER_NO_TASK != e->episode_timeout_task) 746 if (NULL != e->episode_timeout_task)
747 { 747 {
748 GNUNET_SCHEDULER_cancel (e->episode_timeout_task); 748 GNUNET_SCHEDULER_cancel (e->episode_timeout_task);
749 e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK; 749 e->episode_timeout_task = NULL;
750 } 750 }
751 free_experiment (e); 751 free_experiment (e);
752} 752}