- verboser log, faster start

[oweals/gnunet.git] / src / testbed / testbed_api_operations.c

diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c
index e657c8354de2ca0f07a962070fd4916240870476..3e7eb91bde1738aaacc35da441490126e0d9e00e 100644 (file)
--- a/src/testbed/testbed_api_operations.c
+++ b/src/testbed/testbed_api_operations.c
@@ -46,6 +46,11 @@ struct QueueEntry
    * The operation this entry holds
    */
   struct GNUNET_TESTBED_Operation *op;
+
+  /**
+   * How many units of resources does the operation need
+   */
+  unsigned int nres;
 };
 
 
@@ -87,17 +92,17 @@ enum OperationState
    * The operation is just created and is in initial state
    */
   OP_STATE_INIT,
-  
+
   /**
    * The operation is currently waiting for resources
    */
   OP_STATE_WAITING,
-  
+
   /**
    * The operation is ready to be started
    */
   OP_STATE_READY,
-  
+
   /**
    * The operation has started
    */
@@ -131,6 +136,12 @@ struct GNUNET_TESTBED_Operation
    */
   struct OperationQueue **queues;
 
+  /**
+   * Array of number resources an operation need from each queue. This numbers
+   * in this array should correspond to the queues array
+   */
+  unsigned int *nres;
+
   /**
    * The id of the task which calls OperationStart for this operation
    */
@@ -179,15 +190,38 @@ check_readiness (struct GNUNET_TESTBED_Operation *op)
 
   GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == op->start_task_id);
   for (i = 0; i < op->nqueues; i++)
-    if (op->queues[i]->active >= op->queues[i]->max_active)
+  {
+    GNUNET_assert (0 < op->nres[i]);
+    if ((op->queues[i]->active + op->nres[i]) > op->queues[i]->max_active)
       return;
+  }
   for (i = 0; i < op->nqueues; i++)
-    op->queues[i]->active++;
+    op->queues[i]->active += op->nres[i];
   op->state = OP_STATE_READY;
   op->start_task_id = GNUNET_SCHEDULER_add_now (&call_start, op);
 }
 
 
+/**
+ * Defers a ready to be executed operation back to waiting
+ *
+ * @param op the operation to defer
+ */
+static void
+defer (struct GNUNET_TESTBED_Operation *op)
+{
+  unsigned int i;
+
+  GNUNET_assert (OP_STATE_READY == op->state);
+  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != op->start_task_id);
+  GNUNET_SCHEDULER_cancel (op->start_task_id);
+  op->start_task_id = GNUNET_SCHEDULER_NO_TASK;
+  for (i = 0; i < op->nqueues; i++)
+    op->queues[i]->active--;
+  op->state = OP_STATE_WAITING;
+}
+
+
 /**
  * Create an 'operation' to be performed.
  *
@@ -258,13 +292,21 @@ GNUNET_TESTBED_operation_queue_reset_max_active_ (struct OperationQueue *queue,
                                                   unsigned int max_active)
 {
   struct QueueEntry *entry;
-  
+
   queue->max_active = max_active;
-  if (queue->active >= queue->max_active)
-    return;
+  /* if (queue->active >= queue->max_active) */
+  /*   return; */
+
   entry = queue->head;
-  while ( (NULL != entry) &&
-          (queue->active < queue->max_active) )
+  while ((queue->active > queue->max_active) && (NULL != entry))
+  {
+    if (entry->op->state == OP_STATE_READY)
+      defer (entry->op);
+    entry = entry->next;
+  }
+
+  entry = queue->head;
+  while ((NULL != entry) && (queue->active < queue->max_active))
   {
     if (OP_STATE_WAITING == entry->op->state)
       check_readiness (entry->op);
@@ -281,22 +323,46 @@ GNUNET_TESTBED_operation_queue_reset_max_active_ (struct OperationQueue *queue,
  *
  * @param queue queue to add the operation to
  * @param operation operation to add to the queue
+ * @param nres the number of units of the resources of queue needed by the
+ *          operation. Should be greater than 0.
  */
 void
-GNUNET_TESTBED_operation_queue_insert_ (struct OperationQueue *queue,
-                                        struct GNUNET_TESTBED_Operation
-                                        *operation)
+GNUNET_TESTBED_operation_queue_insert2_ (struct OperationQueue *queue,
+                                         struct GNUNET_TESTBED_Operation
+                                         *operation, unsigned int nres)
 {
   struct QueueEntry *entry;
+  unsigned int qsize;
 
+  GNUNET_assert (0 < nres);
   entry = GNUNET_malloc (sizeof (struct QueueEntry));
   entry->op = operation;
+  entry->nres = nres;
   GNUNET_CONTAINER_DLL_insert_tail (queue->head, queue->tail, entry);
-  operation->queues =
-      GNUNET_realloc (operation->queues,
-                      sizeof (struct OperationQueue *) *
-                      (++operation->nqueues));
-  operation->queues[operation->nqueues - 1] = queue;
+  qsize = operation->nqueues;
+  GNUNET_array_append (operation->queues, operation->nqueues, queue);
+  GNUNET_array_append (operation->nres, qsize, nres);
+  GNUNET_assert (qsize == operation->nqueues);
+}
+
+
+/**
+ * Add an operation to a queue.  An operation can be in multiple queues at
+ * once. Once the operation is inserted into all the queues
+ * GNUNET_TESTBED_operation_begin_wait_() has to be called to actually start
+ * waiting for the operation to become active. The operation is assumed to take
+ * 1 queue resource. Use GNUNET_TESTBED_operation_queue_insert2_() if it
+ * requires more than 1
+ *
+ * @param queue queue to add the operation to
+ * @param operation operation to add to the queue
+ */
+void
+GNUNET_TESTBED_operation_queue_insert_ (struct OperationQueue *queue,
+                                        struct GNUNET_TESTBED_Operation
+                                        *operation)
+{
+  return GNUNET_TESTBED_operation_queue_insert2_ (queue, operation, 1);
 }
 
 
@@ -311,7 +377,7 @@ GNUNET_TESTBED_operation_queue_insert_ (struct OperationQueue *queue,
  */
 void
 GNUNET_TESTBED_operation_begin_wait_ (struct GNUNET_TESTBED_Operation
-                                     *operation)
+                                      *operation)
 {
   GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == operation->start_task_id);
   operation->state = OP_STATE_WAITING;
@@ -340,10 +406,18 @@ GNUNET_TESTBED_operation_queue_remove_ (struct OperationQueue *queue,
     if (entry->op == operation)
       break;
   GNUNET_assert (NULL != entry);
-  if (OP_STATE_STARTED == operation->state)
+  GNUNET_assert (0 < entry->nres);
+  switch (operation->state)
   {
+  case OP_STATE_INIT:
+  case OP_STATE_WAITING:
+    break;
+  case OP_STATE_READY:
+  case OP_STATE_STARTED:
     GNUNET_assert (0 != queue->active);
-    queue->active--;
+    GNUNET_assert (queue->active >= entry->nres);
+    queue->active -= entry->nres;
+    break;
   }
   entry2 = entry->next;
   GNUNET_CONTAINER_DLL_remove (queue->head, queue->tail, entry);
@@ -376,6 +450,7 @@ GNUNET_TESTBED_operation_release_ (struct GNUNET_TESTBED_Operation *operation)
   for (i = 0; i < operation->nqueues; i++)
     GNUNET_TESTBED_operation_queue_remove_ (operation->queues[i], operation);
   GNUNET_free (operation->queues);
+  GNUNET_free (operation->nres);
   if (NULL != operation->release)
     operation->release (operation->cb_cls);
   GNUNET_free (operation);