aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/testbed_api_operations.c
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2013-01-25 15:28:08 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2013-01-25 15:28:08 +0000
commit30c5c323f28ade8a1e7c6c593778793e44accb3a (patch)
tree845955ec895d221338b44f0cadce7932932e78cc /src/testbed/testbed_api_operations.c
parent43d558efd13a3245e65efd0acdc9c4ba59cd2bee (diff)
downloadgnunet-30c5c323f28ade8a1e7c6c593778793e44accb3a.tar.gz
gnunet-30c5c323f28ade8a1e7c6c593778793e44accb3a.zip
- indent
Diffstat (limited to 'src/testbed/testbed_api_operations.c')
-rw-r--r--src/testbed/testbed_api_operations.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c
index 139448d91..3e7eb91bd 100644
--- a/src/testbed/testbed_api_operations.c
+++ b/src/testbed/testbed_api_operations.c
@@ -92,17 +92,17 @@ enum OperationState
92 * The operation is just created and is in initial state 92 * The operation is just created and is in initial state
93 */ 93 */
94 OP_STATE_INIT, 94 OP_STATE_INIT,
95 95
96 /** 96 /**
97 * The operation is currently waiting for resources 97 * The operation is currently waiting for resources
98 */ 98 */
99 OP_STATE_WAITING, 99 OP_STATE_WAITING,
100 100
101 /** 101 /**
102 * The operation is ready to be started 102 * The operation is ready to be started
103 */ 103 */
104 OP_STATE_READY, 104 OP_STATE_READY,
105 105
106 /** 106 /**
107 * The operation has started 107 * The operation has started
108 */ 108 */
@@ -292,14 +292,13 @@ GNUNET_TESTBED_operation_queue_reset_max_active_ (struct OperationQueue *queue,
292 unsigned int max_active) 292 unsigned int max_active)
293{ 293{
294 struct QueueEntry *entry; 294 struct QueueEntry *entry;
295 295
296 queue->max_active = max_active; 296 queue->max_active = max_active;
297 /* if (queue->active >= queue->max_active) */ 297 /* if (queue->active >= queue->max_active) */
298 /* return; */ 298 /* return; */
299 299
300 entry = queue->head; 300 entry = queue->head;
301 while ( (queue->active > queue->max_active) && 301 while ((queue->active > queue->max_active) && (NULL != entry))
302 (NULL != entry))
303 { 302 {
304 if (entry->op->state == OP_STATE_READY) 303 if (entry->op->state == OP_STATE_READY)
305 defer (entry->op); 304 defer (entry->op);
@@ -307,8 +306,7 @@ GNUNET_TESTBED_operation_queue_reset_max_active_ (struct OperationQueue *queue,
307 } 306 }
308 307
309 entry = queue->head; 308 entry = queue->head;
310 while ( (NULL != entry) && 309 while ((NULL != entry) && (queue->active < queue->max_active))
311 (queue->active < queue->max_active) )
312 { 310 {
313 if (OP_STATE_WAITING == entry->op->state) 311 if (OP_STATE_WAITING == entry->op->state)
314 check_readiness (entry->op); 312 check_readiness (entry->op);
@@ -331,8 +329,7 @@ GNUNET_TESTBED_operation_queue_reset_max_active_ (struct OperationQueue *queue,
331void 329void
332GNUNET_TESTBED_operation_queue_insert2_ (struct OperationQueue *queue, 330GNUNET_TESTBED_operation_queue_insert2_ (struct OperationQueue *queue,
333 struct GNUNET_TESTBED_Operation 331 struct GNUNET_TESTBED_Operation
334 *operation, 332 *operation, unsigned int nres)
335 unsigned int nres)
336{ 333{
337 struct QueueEntry *entry; 334 struct QueueEntry *entry;
338 unsigned int qsize; 335 unsigned int qsize;
@@ -380,7 +377,7 @@ GNUNET_TESTBED_operation_queue_insert_ (struct OperationQueue *queue,
380 */ 377 */
381void 378void
382GNUNET_TESTBED_operation_begin_wait_ (struct GNUNET_TESTBED_Operation 379GNUNET_TESTBED_operation_begin_wait_ (struct GNUNET_TESTBED_Operation
383 *operation) 380 *operation)
384{ 381{
385 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == operation->start_task_id); 382 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == operation->start_task_id);
386 operation->state = OP_STATE_WAITING; 383 operation->state = OP_STATE_WAITING;