diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-01-25 15:28:08 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-01-25 15:28:08 +0000 |
commit | 30c5c323f28ade8a1e7c6c593778793e44accb3a (patch) | |
tree | 845955ec895d221338b44f0cadce7932932e78cc /src/testbed/test_testbed_api_operations.c | |
parent | 43d558efd13a3245e65efd0acdc9c4ba59cd2bee (diff) | |
download | gnunet-30c5c323f28ade8a1e7c6c593778793e44accb3a.tar.gz gnunet-30c5c323f28ade8a1e7c6c593778793e44accb3a.zip |
- indent
Diffstat (limited to 'src/testbed/test_testbed_api_operations.c')
-rw-r--r-- | src/testbed/test_testbed_api_operations.c | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/src/testbed/test_testbed_api_operations.c b/src/testbed/test_testbed_api_operations.c index 2320c4d1b..24f23be23 100644 --- a/src/testbed/test_testbed_api_operations.c +++ b/src/testbed/test_testbed_api_operations.c | |||
@@ -60,7 +60,7 @@ struct GNUNET_TESTBED_Operation *op2; | |||
60 | * This operation should go into both queues and should consume 2 units of | 60 | * This operation should go into both queues and should consume 2 units of |
61 | * resources on both queues. Since op2 needs a resource from both queues and is | 61 | * resources on both queues. Since op2 needs a resource from both queues and is |
62 | * queues before this operation, it will be blocked until op2 is released even | 62 | * queues before this operation, it will be blocked until op2 is released even |
63 | * though q1 has | 63 | * though q1 has |
64 | */ | 64 | */ |
65 | struct GNUNET_TESTBED_Operation *op3; | 65 | struct GNUNET_TESTBED_Operation *op3; |
66 | 66 | ||
@@ -145,7 +145,7 @@ enum Test | |||
145 | * op4 has started | 145 | * op4 has started |
146 | */ | 146 | */ |
147 | TEST_OP4_STARTED, | 147 | TEST_OP4_STARTED, |
148 | 148 | ||
149 | /** | 149 | /** |
150 | * op4 has released | 150 | * op4 has released |
151 | */ | 151 | */ |
@@ -258,39 +258,42 @@ start_cb (void *cls) | |||
258 | GNUNET_assert (&op1 == cls); | 258 | GNUNET_assert (&op1 == cls); |
259 | result = TEST_OP1_STARTED; | 259 | result = TEST_OP1_STARTED; |
260 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); | 260 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); |
261 | step_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &step, NULL); | 261 | step_task = |
262 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &step, NULL); | ||
262 | break; | 263 | break; |
263 | case TEST_PAUSE: | 264 | case TEST_PAUSE: |
264 | GNUNET_assert (&op2 == cls); | 265 | GNUNET_assert (&op2 == cls); |
265 | result = TEST_OP2_STARTED; | 266 | result = TEST_OP2_STARTED; |
266 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); | 267 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); |
267 | step_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &step, NULL); | 268 | step_task = |
269 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &step, NULL); | ||
268 | break; | 270 | break; |
269 | case TEST_OP2_RELEASED: | 271 | case TEST_OP2_RELEASED: |
270 | GNUNET_assert (&op3 == cls); | 272 | GNUNET_assert (&op3 == cls); |
271 | result = TEST_OP3_STARTED; | 273 | result = TEST_OP3_STARTED; |
272 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); | 274 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); |
273 | step_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &step, NULL); | 275 | step_task = |
276 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &step, NULL); | ||
274 | break; | 277 | break; |
275 | case TEST_OP3_RELEASED: | 278 | case TEST_OP3_RELEASED: |
276 | GNUNET_assert (&op4 == cls); | 279 | GNUNET_assert (&op4 == cls); |
277 | result = TEST_OP4_STARTED; | 280 | result = TEST_OP4_STARTED; |
278 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); | 281 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == step_task); |
279 | step_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &step, | 282 | step_task = |
280 | NULL); | 283 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &step, NULL); |
281 | break; | 284 | break; |
282 | case TEST_OP4_RELEASED: | 285 | case TEST_OP4_RELEASED: |
286 | { | ||
287 | static int nops; | ||
288 | |||
289 | nops++; | ||
290 | if (nops == 3) | ||
283 | { | 291 | { |
284 | static int nops; | 292 | result = TEST_OP5_6_7_STARTED; |
285 | 293 | GNUNET_TESTBED_operation_release_ (op5); | |
286 | nops++; | 294 | op5 = NULL; |
287 | if (nops == 3) | ||
288 | { | ||
289 | result = TEST_OP5_6_7_STARTED; | ||
290 | GNUNET_TESTBED_operation_release_ (op5); | ||
291 | op5 = NULL; | ||
292 | } | ||
293 | } | 295 | } |
296 | } | ||
294 | break; | 297 | break; |
295 | default: | 298 | default: |
296 | GNUNET_assert (0); | 299 | GNUNET_assert (0); |
@@ -316,8 +319,8 @@ release_cb (void *cls) | |||
316 | GNUNET_assert (&op1 == cls); | 319 | GNUNET_assert (&op1 == cls); |
317 | result = TEST_OP1_RELEASED; | 320 | result = TEST_OP1_RELEASED; |
318 | op1 = NULL; | 321 | op1 = NULL; |
319 | step_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &step, | 322 | step_task = |
320 | NULL); | 323 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &step, NULL); |
321 | break; | 324 | break; |
322 | case TEST_OP2_STARTED: | 325 | case TEST_OP2_STARTED: |
323 | GNUNET_assert (&op2 == cls); | 326 | GNUNET_assert (&op2 == cls); |