aboutsummaryrefslogtreecommitdiff
path: root/src/ats-tests/ats-testing-experiment.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ats-tests/ats-testing-experiment.c')
-rw-r--r--src/ats-tests/ats-testing-experiment.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ats-tests/ats-testing-experiment.c b/src/ats-tests/ats-testing-experiment.c
index b07d8fdcd..05c27cbc4 100644
--- a/src/ats-tests/ats-testing-experiment.c
+++ b/src/ats-tests/ats-testing-experiment.c
@@ -420,13 +420,13 @@ static void
420timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc) 420timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
421{ 421{
422 struct Experiment *e = cls; 422 struct Experiment *e = cls;
423 e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK; 423 e->experiment_timeout_task = NULL;
424 fprintf (stderr, "Experiment timeout!\n"); 424 fprintf (stderr, "Experiment timeout!\n");
425 425
426 if (GNUNET_SCHEDULER_NO_TASK != e->episode_timeout_task) 426 if (NULL != e->episode_timeout_task)
427 { 427 {
428 GNUNET_SCHEDULER_cancel (e->episode_timeout_task); 428 GNUNET_SCHEDULER_cancel (e->episode_timeout_task);
429 e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK; 429 e->episode_timeout_task = NULL;
430 } 430 }
431 431
432 e->e_done_cb (e, GNUNET_TIME_absolute_get_duration(e->start_time), 432 e->e_done_cb (e, GNUNET_TIME_absolute_get_duration(e->start_time),
@@ -578,7 +578,7 @@ static void
578timeout_episode (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc) 578timeout_episode (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
579{ 579{
580 struct Experiment *e = cls; 580 struct Experiment *e = cls;
581 e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK; 581 e->episode_timeout_task = NULL;
582 if (NULL != e->ep_done_cb) 582 if (NULL != e->ep_done_cb)
583 e->ep_done_cb (e->cur); 583 e->ep_done_cb (e->cur);
584 584
@@ -588,10 +588,10 @@ timeout_episode (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
588 { 588 {
589 /* done */ 589 /* done */
590 fprintf (stderr, "Last episode done!\n"); 590 fprintf (stderr, "Last episode done!\n");
591 if (GNUNET_SCHEDULER_NO_TASK != e->experiment_timeout_task) 591 if (NULL != e->experiment_timeout_task)
592 { 592 {
593 GNUNET_SCHEDULER_cancel (e->experiment_timeout_task); 593 GNUNET_SCHEDULER_cancel (e->experiment_timeout_task);
594 e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK; 594 e->experiment_timeout_task = NULL;
595 } 595 }
596 e->e_done_cb (e, GNUNET_TIME_absolute_get_duration(e->start_time), GNUNET_OK); 596 e->e_done_cb (e, GNUNET_TIME_absolute_get_duration(e->start_time), GNUNET_OK);
597 return; 597 return;
@@ -728,15 +728,15 @@ GNUNET_ATS_TEST_experimentation_load (char *filename)
728void 728void
729GNUNET_ATS_TEST_experimentation_stop (struct Experiment *e) 729GNUNET_ATS_TEST_experimentation_stop (struct Experiment *e)
730{ 730{
731 if (GNUNET_SCHEDULER_NO_TASK != e->experiment_timeout_task) 731 if (NULL != e->experiment_timeout_task)
732 { 732 {
733 GNUNET_SCHEDULER_cancel (e->experiment_timeout_task); 733 GNUNET_SCHEDULER_cancel (e->experiment_timeout_task);
734 e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK; 734 e->experiment_timeout_task = NULL;
735 } 735 }
736 if (GNUNET_SCHEDULER_NO_TASK != e->episode_timeout_task) 736 if (NULL != e->episode_timeout_task)
737 { 737 {
738 GNUNET_SCHEDULER_cancel (e->episode_timeout_task); 738 GNUNET_SCHEDULER_cancel (e->episode_timeout_task);
739 e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK; 739 e->episode_timeout_task = NULL;
740 } 740 }
741 free_experiment (e); 741 free_experiment (e);
742} 742}