/*
This file is part of GNUnet
- (C) 2008--2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2008--2013 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
/**
* The delay task identifier
*/
-GNUNET_SCHEDULER_TaskIdentifier step_task;
+struct GNUNET_SCHEDULER_Task * step_task;
/**
* Task to simulate artificial delay and change the test stage
*
* @param cls NULL
- * @param tc the task context
*/
static void
-step (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+step (void *cls)
{
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != step_task);
- step_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_assert (NULL != step_task);
+ step_task = NULL;
switch (result)
{
case TEST_OP1_STARTED:
case TEST_OP4_STARTED:
GNUNET_TESTBED_operation_release_ (op4);
break;
- case TEST_OP6_RELEASED:
- op8 = GNUNET_TESTBED_operation_create_ (&op8, &start_cb, &release_cb);
+ case TEST_OP6_RELEASED:
+ op8 = GNUNET_TESTBED_operation_create_ (&op8, &start_cb, &release_cb);
GNUNET_TESTBED_operation_queue_insert2_ (q1, op8, 2);
GNUNET_TESTBED_operation_queue_insert2_ (q2, op8, 2);
result = TEST_OP8_WAITING;
case TEST_OP8_INACTIVE_1:
GNUNET_TESTBED_operation_activate_ (op8);
result = TEST_OP8_ACTIVE;
- op9 = GNUNET_TESTBED_operation_create_ (&op9, &start_cb, &release_cb);
+ op9 = GNUNET_TESTBED_operation_create_ (&op9, &start_cb, &release_cb);
GNUNET_TESTBED_operation_queue_insert2_ (q1, op9, 1);
GNUNET_TESTBED_operation_queue_insert2_ (q2, op9, 1);
GNUNET_TESTBED_operation_begin_wait_ (op9);
step_task = GNUNET_SCHEDULER_add_delayed (STEP_DELAY, &step, NULL);
break;
- case TEST_OP8_ACTIVE:
+ case TEST_OP8_ACTIVE:
GNUNET_TESTBED_operation_inactivate_ (op8);
/* op8 should be released by now due to above call */
GNUNET_assert (TEST_OP8_RELEASED == result);
case TEST_INIT:
GNUNET_assert (&op1 == cls);
result = TEST_OP1_STARTED;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task);
+ GNUNET_assert (NULL == step_task);
step_task =
GNUNET_SCHEDULER_add_delayed (STEP_DELAY, &step, NULL);
break;
case TEST_PAUSE:
GNUNET_assert (&op2 == cls);
result = TEST_OP2_STARTED;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task);
+ GNUNET_assert (NULL == step_task);
step_task =
GNUNET_SCHEDULER_add_delayed (STEP_DELAY, &step, NULL);
break;
case TEST_OP2_RELEASED:
GNUNET_assert (&op3 == cls);
result = TEST_OP3_STARTED;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task);
+ GNUNET_assert (NULL == step_task);
step_task =
GNUNET_SCHEDULER_add_delayed (STEP_DELAY, &step, NULL);
break;
case TEST_OP3_RELEASED:
GNUNET_assert (&op4 == cls);
result = TEST_OP4_STARTED;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task);
+ GNUNET_assert (NULL == step_task);
step_task =
GNUNET_SCHEDULER_add_delayed (STEP_DELAY, &step, NULL);
break;
case TEST_OP2_STARTED:
GNUNET_assert (&op2 == cls);
result = TEST_OP2_RELEASED;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task);
+ GNUNET_assert (NULL == step_task);
break;
case TEST_OP3_STARTED:
GNUNET_assert (&op3 == cls);
result = TEST_OP3_RELEASED;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task);
+ GNUNET_assert (NULL == step_task);
break;
case TEST_OP4_STARTED:
GNUNET_assert (&op4 == cls);
result = TEST_OP4_RELEASED;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task);
+ GNUNET_assert (NULL == step_task);
op5 = GNUNET_TESTBED_operation_create_ (&op5, &start_cb, &release_cb);
GNUNET_TESTBED_operation_queue_insert2_ (q1, op5, 1);
GNUNET_TESTBED_operation_begin_wait_ (op5);