msg->config_size = htonl (c_size);
GNUNET_CONTAINER_DLL_insert_tail (opc->c->ocq_head, opc->c->ocq_tail, opc);
GNUNET_TESTBED_queue_message_ (opc->c, &msg->header);
-};
+}
/**
{
struct OperationContext *opc = cls;
- if (OPC_STATE_FINISHED != opc->state)
+ switch (opc->state)
{
+ case OPC_STATE_STARTED:
+ GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
+ /* No break we continue flow */
+ case OPC_STATE_INIT:
GNUNET_free (((struct PeerCreateData *) opc->data)->peer);
GNUNET_free (opc->data);
- GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
+ break;
+ case OPC_STATE_FINISHED:
+ break;
}
GNUNET_free (opc);
}
{
struct OperationContext *opc = cls;
- if (OPC_STATE_FINISHED != opc->state)
+ if (OPC_STATE_STARTED == opc->state)
{
GNUNET_free (opc->data);
GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
opc = GNUNET_malloc (sizeof (struct OperationContext));
opc->c = controller;
opc->data = data;
- opc->id = controller->operation_counter++;
+ opc->id = GNUNET_TESTBED_get_next_op_id (controller);
opc->type = OP_PEER_CREATE;
opc->op =
GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_create,
&oprelease_peer_create);
GNUNET_TESTBED_operation_queue_insert_ (controller->opq_parallel_operations,
opc->op);
+ GNUNET_TESTBED_operation_begin_wait_ (opc->op);
return opc->op;
}
/**
* Start the given peer.
*
+ * @param op_cls the closure for this operation; will be set in
+ * event->details.operation_finished.op_cls when this operation fails.
* @param peer peer to start
* @param pcc function to call upon completion
* @param pcc_cls closure for 'pcc'
* @return handle to the operation
*/
struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_start (struct GNUNET_TESTBED_Peer *peer,
+GNUNET_TESTBED_peer_start (void *op_cls,
+ struct GNUNET_TESTBED_Peer *peer,
GNUNET_TESTBED_PeerChurnCallback pcc,
void *pcc_cls)
{
opc = GNUNET_malloc (sizeof (struct OperationContext));
opc->c = peer->controller;
opc->data = data;
- opc->id = opc->c->operation_counter++;
+ opc->op_cls = op_cls;
+ opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
opc->type = OP_PEER_START;
opc->op =
GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_start,
&oprelease_peer_start);
GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
opc->op);
+ GNUNET_TESTBED_operation_begin_wait_ (opc->op);
return opc->op;
}
opc = GNUNET_malloc (sizeof (struct OperationContext));
opc->c = peer->controller;
opc->data = data;
- opc->id = opc->c->operation_counter++;
+ opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
opc->type = OP_PEER_STOP;
opc->op =
GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_stop,
&oprelease_peer_stop);
GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
opc->op);
+ GNUNET_TESTBED_operation_begin_wait_ (opc->op);
return opc->op;
}
opc->c = peer->controller;
opc->data = data;
opc->type = OP_PEER_INFO;
- opc->id = opc->c->operation_counter++;
+ opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
opc->op =
GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_getinfo,
&oprelease_peer_getinfo);
GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
opc->op);
+ GNUNET_TESTBED_operation_begin_wait_ (opc->op);
return opc->op;
}
opc = GNUNET_malloc (sizeof (struct OperationContext));
opc->data = peer;
opc->c = peer->controller;
- opc->id = peer->controller->operation_counter++;
+ opc->id = GNUNET_TESTBED_get_next_op_id (peer->controller);
opc->type = OP_PEER_DESTROY;
opc->op =
GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_destroy,
&oprelease_peer_destroy);
GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
opc->op);
+ GNUNET_TESTBED_operation_begin_wait_ (opc->op);
return opc->op;
}
data->p2 = p2;
data->cb = cb;
data->cb_cls = cb_cls;
+ data->state = OCD_INIT;
opc = GNUNET_malloc (sizeof (struct OperationContext));
opc->data = data;
opc->c = p1->controller;
- opc->id = opc->c->operation_counter++;
+ opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
opc->type = OP_OVERLAY_CONNECT;
+ opc->op_cls = op_cls;
opc->op =
GNUNET_TESTBED_operation_create_ (opc, &opstart_overlay_connect,
&oprelease_overlay_connect);
- GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
- opc->op);
+ /* GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations, */
+ /* opc->op); */
+ GNUNET_TESTBED_operation_queue_insert_
+ (opc->c->opq_parallel_overlay_connect_operations, opc->op);
+ GNUNET_TESTBED_operation_begin_wait_ (opc->op);
return opc->op;
}