aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/test_testbed_api_operations.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testbed/test_testbed_api_operations.c')
-rw-r--r--src/testbed/test_testbed_api_operations.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/testbed/test_testbed_api_operations.c b/src/testbed/test_testbed_api_operations.c
index ceae76cd4..b3402868a 100644
--- a/src/testbed/test_testbed_api_operations.c
+++ b/src/testbed/test_testbed_api_operations.c
@@ -115,7 +115,7 @@ struct GNUNET_TESTBED_Operation *op9;
115/** 115/**
116 * The delay task identifier 116 * The delay task identifier
117 */ 117 */
118GNUNET_SCHEDULER_TaskIdentifier step_task; 118struct GNUNET_SCHEDULER_Task * step_task;
119 119
120 120
121/** 121/**
@@ -267,8 +267,8 @@ release_cb (void *cls);
267static void 267static void
268step (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 268step (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
269{ 269{
270 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != step_task); 270 GNUNET_assert (NULL != step_task);
271 step_task = GNUNET_SCHEDULER_NO_TASK; 271 step_task = NULL;
272 switch (result) 272 switch (result)
273 { 273 {
274 case TEST_OP1_STARTED: 274 case TEST_OP1_STARTED:
@@ -344,28 +344,28 @@ start_cb (void *cls)
344 case TEST_INIT: 344 case TEST_INIT:
345 GNUNET_assert (&op1 == cls); 345 GNUNET_assert (&op1 == cls);
346 result = TEST_OP1_STARTED; 346 result = TEST_OP1_STARTED;
347 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); 347 GNUNET_assert (NULL == step_task);
348 step_task = 348 step_task =
349 GNUNET_SCHEDULER_add_delayed (STEP_DELAY, &step, NULL); 349 GNUNET_SCHEDULER_add_delayed (STEP_DELAY, &step, NULL);
350 break; 350 break;
351 case TEST_PAUSE: 351 case TEST_PAUSE:
352 GNUNET_assert (&op2 == cls); 352 GNUNET_assert (&op2 == cls);
353 result = TEST_OP2_STARTED; 353 result = TEST_OP2_STARTED;
354 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); 354 GNUNET_assert (NULL == step_task);
355 step_task = 355 step_task =
356 GNUNET_SCHEDULER_add_delayed (STEP_DELAY, &step, NULL); 356 GNUNET_SCHEDULER_add_delayed (STEP_DELAY, &step, NULL);
357 break; 357 break;
358 case TEST_OP2_RELEASED: 358 case TEST_OP2_RELEASED:
359 GNUNET_assert (&op3 == cls); 359 GNUNET_assert (&op3 == cls);
360 result = TEST_OP3_STARTED; 360 result = TEST_OP3_STARTED;
361 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); 361 GNUNET_assert (NULL == step_task);
362 step_task = 362 step_task =
363 GNUNET_SCHEDULER_add_delayed (STEP_DELAY, &step, NULL); 363 GNUNET_SCHEDULER_add_delayed (STEP_DELAY, &step, NULL);
364 break; 364 break;
365 case TEST_OP3_RELEASED: 365 case TEST_OP3_RELEASED:
366 GNUNET_assert (&op4 == cls); 366 GNUNET_assert (&op4 == cls);
367 result = TEST_OP4_STARTED; 367 result = TEST_OP4_STARTED;
368 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); 368 GNUNET_assert (NULL == step_task);
369 step_task = 369 step_task =
370 GNUNET_SCHEDULER_add_delayed (STEP_DELAY, &step, NULL); 370 GNUNET_SCHEDULER_add_delayed (STEP_DELAY, &step, NULL);
371 break; 371 break;
@@ -422,17 +422,17 @@ release_cb (void *cls)
422 case TEST_OP2_STARTED: 422 case TEST_OP2_STARTED:
423 GNUNET_assert (&op2 == cls); 423 GNUNET_assert (&op2 == cls);
424 result = TEST_OP2_RELEASED; 424 result = TEST_OP2_RELEASED;
425 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); 425 GNUNET_assert (NULL == step_task);
426 break; 426 break;
427 case TEST_OP3_STARTED: 427 case TEST_OP3_STARTED:
428 GNUNET_assert (&op3 == cls); 428 GNUNET_assert (&op3 == cls);
429 result = TEST_OP3_RELEASED; 429 result = TEST_OP3_RELEASED;
430 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); 430 GNUNET_assert (NULL == step_task);
431 break; 431 break;
432 case TEST_OP4_STARTED: 432 case TEST_OP4_STARTED:
433 GNUNET_assert (&op4 == cls); 433 GNUNET_assert (&op4 == cls);
434 result = TEST_OP4_RELEASED; 434 result = TEST_OP4_RELEASED;
435 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); 435 GNUNET_assert (NULL == step_task);
436 op5 = GNUNET_TESTBED_operation_create_ (&op5, &start_cb, &release_cb); 436 op5 = GNUNET_TESTBED_operation_create_ (&op5, &start_cb, &release_cb);
437 GNUNET_TESTBED_operation_queue_insert2_ (q1, op5, 1); 437 GNUNET_TESTBED_operation_queue_insert2_ (q1, op5, 1);
438 GNUNET_TESTBED_operation_begin_wait_ (op5); 438 GNUNET_TESTBED_operation_begin_wait_ (op5);