diff options
| author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-01-01 22:43:24 +0000 |
|---|---|---|
| committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-01-01 22:43:24 +0000 |
| commit | 5200c6d68ff70c484c480794e5debbc50b62e2aa (patch) | |
| tree | be43708e648a31833b88d12015ba5e3383e09ba1 /src/testbed/test_testbed_api_operations.c | |
| parent | ed8bae1885d78ce9d91bf742e0a8080a7e922b76 (diff) | |
- make operations wait when max_active is decreased
Diffstat (limited to 'src/testbed/test_testbed_api_operations.c')
| -rw-r--r-- | src/testbed/test_testbed_api_operations.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/testbed/test_testbed_api_operations.c b/src/testbed/test_testbed_api_operations.c index 92bf12983f..cccaac4d01 100644 --- a/src/testbed/test_testbed_api_operations.c +++ b/src/testbed/test_testbed_api_operations.c @@ -88,6 +88,12 @@ enum Test */ TEST_OP1_RELEASED, + /** + * Temporary pause where no operations should start as we set max active in q1 + * to 0 in stage TEST_OP1_STARTED + */ + TEST_PAUSE, + /** * op2 has started */ @@ -99,12 +105,6 @@ enum Test TEST_OP2_RELEASED, /** - * Temporary pause where no operations should start as we set max active in q1 - * to 0 - */ - TEST_PAUSE, - - /** * op3 has started */ TEST_OP3_STARTED, @@ -164,13 +164,13 @@ step (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_TESTBED_operation_queue_insert_ (q2, op3); GNUNET_TESTBED_operation_begin_wait_ (op3); break; - case TEST_OP2_STARTED: - GNUNET_TESTBED_operation_release_ (op2); - break; - case TEST_OP2_RELEASED: + case TEST_OP1_RELEASED: result = TEST_PAUSE; GNUNET_TESTBED_operation_queue_reset_max_active_ (q1, 1); break; + case TEST_OP2_STARTED: + GNUNET_TESTBED_operation_release_ (op2); + break; case TEST_OP3_STARTED: GNUNET_TESTBED_operation_release_ (op3); break; @@ -196,13 +196,13 @@ start_cb (void *cls) GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); step_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &step, NULL); break; - case TEST_OP1_RELEASED: + case TEST_PAUSE: GNUNET_assert (&op2 == cls); result = TEST_OP2_STARTED; GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); step_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &step, NULL); break; - case TEST_PAUSE: + case TEST_OP2_RELEASED: GNUNET_assert (&op3 == cls); result = TEST_OP3_STARTED; GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); @@ -232,13 +232,14 @@ release_cb (void *cls) GNUNET_assert (&op1 == cls); result = TEST_OP1_RELEASED; op1 = NULL; - //GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &step, NULL); + step_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &step, + NULL); break; case TEST_OP2_STARTED: GNUNET_assert (&op2 == cls); result = TEST_OP2_RELEASED; GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); - step_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &step, NULL); + //step_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &step, NULL); break; case TEST_OP3_STARTED: GNUNET_assert (&op3 == cls); |