state information for OperationContext

3 files changed, 65 insertions, 19 deletions

diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index f8d8e11fc..11b70382c 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -261,7 +261,7 @@ handle_opsuccess (struct GNUNET_TESTBED_Controller *c,
   if (0 != (c->event_mask & (1L << GNUNET_TESTBED_ET_OPERATION_FINISHED)))
     event = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_EventInformation));
   if (NULL != event)
-    event->type = GNUNET_TESTBED_ET_OPERATION_FINISHED; 
+    event->type = GNUNET_TESTBED_ET_OPERATION_FINISHED;
   switch (opc->type)
   {
   case OP_PEER_DESTROY:
@@ -284,13 +284,15 @@ handle_opsuccess (struct GNUNET_TESTBED_Controller *c,
     break;
   default:
     GNUNET_assert (0);
-  }  
+  }
+  GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
+  opc->state = OPC_STATE_FINISHED;
   if (NULL != event)
   {
     if (NULL != c->cc)
       c->cc (c->cc_cls, event);
     GNUNET_free (event);
-  }
+  }  
   return GNUNET_YES;  
 }
 
@@ -332,7 +334,10 @@ handle_peer_create_success (struct GNUNET_TESTBED_Controller *c,
   GNUNET_assert (peer->unique_id == ntohl (msg->peer_id));
   peer->state = PS_CREATED;
   cb = data->cb;
-  cls = data->cls;  
+  cls = data->cls;
+  GNUNET_free (opc->data);  
+  GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
+  opc->state = OPC_STATE_FINISHED;
   if (NULL != cb)
     cb (cls, peer, NULL);
   return GNUNET_YES;
@@ -383,12 +388,14 @@ handle_peer_event (struct GNUNET_TESTBED_Controller *c,
   default:
     GNUNET_assert (0);          /* We should never reach this state */
   }
+  GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
+  opc->state = OPC_STATE_FINISHED;
   if (0 != ((GNUNET_TESTBED_ET_PEER_START | GNUNET_TESTBED_ET_PEER_STOP)
             & c->event_mask))
   {
     if (NULL != c->cc)
       c->cc (c->cc_cls, &event);
-  }
+  }    
   return GNUNET_YES;
 }
 
@@ -424,7 +431,6 @@ handle_peer_config (struct GNUNET_TESTBED_Controller *c,
   peer = data->peer;
   GNUNET_assert (NULL != peer);
   GNUNET_assert (ntohl (msg->peer_id) == peer->unique_id);
-  opc->completed = GNUNET_YES;
   if (0 == (c->event_mask & (1L << GNUNET_TESTBED_ET_OPERATION_FINISHED)))
   {
     LOG_DEBUG ("Skipping operation callback as flag not set\n");
@@ -482,7 +488,9 @@ handle_peer_config (struct GNUNET_TESTBED_Controller *c,
     break;
   }
   opc->data = response_data;
-  c->cc (c->cc_cls, &info);
+  GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
+  opc->state = OPC_STATE_FINISHED;
+  c->cc (c->cc_cls, &info);  
   return GNUNET_YES;
 }
 
diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h
index bacb53bb1..4e73c63af 100644
--- a/src/testbed/testbed_api.h
+++ b/src/testbed/testbed_api.h
@@ -113,6 +113,32 @@ struct MessageQueue;
  */
 struct ControllerLink;
 
+
+/**
+ * Enumeration of states of OperationContext
+ */
+enum OperationContextState
+  {
+    /**
+     * The initial state where the associated operation has just been created
+     * and is waiting in the operation queues to be started
+     */
+    OPC_STATE_INIT = 0,
+    
+    /**
+     * The operation has been started. It may occupy some resources which are to
+     * be freed if cancelled.
+     */
+    OPC_STATE_STARTED,
+
+    /**
+     * The operation has finished. The end results of this operation may occupy
+     * some resources which are to be freed by operation_done
+     */
+    OPC_STATE_FINISHED
+  };
+
+
 /**
  * Context information for GNUNET_TESTBED_Operation
  */
@@ -154,10 +180,9 @@ struct OperationContext
   enum OperationType type;
 
   /**
-   * Is this operation completed? (has there been a reply from the service)
+   * The state of the operation
    */
-  int completed;
-
+  enum OperationContextState state;
 };
 
 
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index b30e2a92c..69c3aaac8 100644
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -54,6 +54,7 @@ opstart_peer_create (void *cls)
   data = opc->data;
   GNUNET_assert (NULL != data);
   GNUNET_assert (NULL != data->peer);
+  opc->state = OPC_STATE_STARTED;
   config = GNUNET_CONFIGURATION_serialize (data->cfg, &c_size);
   xc_size = GNUNET_TESTBED_compress_config_ (config, c_size, &xconfig);
   GNUNET_free (config);
@@ -83,9 +84,12 @@ oprelease_peer_create (void *cls)
 {
   struct OperationContext *opc = cls;  
 
-  GNUNET_assert (NULL != opc->data);
-  GNUNET_free (opc->data);  
-  GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
+  if (OPC_STATE_FINISHED != opc->state)
+  {
+    GNUNET_free (((struct PeerCreateData *) opc->data)->peer);
+    GNUNET_free (opc->data);
+    GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
+  }
   GNUNET_free (opc);
 }
 
@@ -105,6 +109,7 @@ opstart_peer_destroy (void *cls)
   GNUNET_assert (OP_PEER_DESTROY == opc->type);
   peer = opc->data;
   GNUNET_assert (NULL != peer);
+  opc->state = OPC_STATE_STARTED;
   msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerDestroyMessage));
   msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerDestroyMessage));
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_DESTROYPEER);
@@ -126,7 +131,8 @@ oprelease_peer_destroy (void *cls)
 {
   struct OperationContext *opc = cls;
   
-  GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
+  if (OPC_STATE_FINISHED != opc->state)
+    GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
   GNUNET_free (opc);
 }
 
@@ -147,6 +153,7 @@ opstart_peer_start (void *cls)
   GNUNET_assert (NULL != opc->data);
   peer = opc->data;
   GNUNET_assert ((PS_CREATED == peer->state) || (PS_STOPPED == peer->state));
+  opc->state = OPC_STATE_STARTED;
   msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerStartMessage));
   msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerStartMessage));
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_STARTPEER);
@@ -167,7 +174,8 @@ oprelease_peer_start (void *cls)
 {
   struct OperationContext *opc = cls;
   
-  GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
+  if (OPC_STATE_FINISHED != opc->state)
+    GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
   GNUNET_free (opc);
 }
 
@@ -187,6 +195,7 @@ opstart_peer_stop (void *cls)
   GNUNET_assert (NULL != opc->data);
   peer = opc->data;
   GNUNET_assert (PS_STARTED == peer->state); 
+  opc->state = OPC_STATE_STARTED;  
   msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerStopMessage));
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_STOPPEER);
   msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerStopMessage));
@@ -207,7 +216,8 @@ oprelease_peer_stop (void *cls)
 {
   struct OperationContext *opc = cls;
   
-  GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
+  if (OPC_STATE_FINISHED != opc->state)
+    GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
   GNUNET_free (opc);
 }
 
@@ -225,7 +235,8 @@ opstart_peer_getinfo (void *cls)
   struct GNUNET_TESTBED_PeerGetConfigurationMessage *msg;
 
   data = opc->data;
-  GNUNET_assert (NULL != data);  
+  GNUNET_assert (NULL != data);
+  opc->state = OPC_STATE_STARTED;
   msg = GNUNET_malloc (sizeof (struct
                                GNUNET_TESTBED_PeerGetConfigurationMessage));
   msg->header.size = htons
@@ -249,8 +260,11 @@ oprelease_peer_getinfo (void *cls)
   struct OperationContext *opc = cls;
   struct PeerInfoData2 *data;
   
-  if (GNUNET_YES != opc->completed)
+  if (OPC_STATE_FINISHED != opc->state)
+  {
     GNUNET_free_non_null (opc->data);
+    GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);  
+  }
   else
   {
     data = opc->data;
@@ -268,7 +282,6 @@ oprelease_peer_getinfo (void *cls)
     }
     GNUNET_free (data);
   }
-  GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
   GNUNET_free (opc);
 }