msg = GNUNET_realloc (xconfig, msize);
memmove (&msg[1], msg, xc_size);
msg->header.size = htons (msize);
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_CREATEPEER);
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER);
msg->operation_id = GNUNET_htonll (opc->id);
msg->host_id = htonl (GNUNET_TESTBED_host_get_id_ (data->peer->host));
msg->peer_id = htonl (data->peer->unique_id);
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);
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_DESTROY_PEER);
msg->peer_id = htonl (peer->unique_id);
msg->operation_id = GNUNET_htonll (opc->id);
GNUNET_CONTAINER_DLL_insert_tail (opc->c->ocq_head, opc->c->ocq_tail, opc);
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);
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_START_PEER);
msg->peer_id = htonl (peer->unique_id);
msg->operation_id = GNUNET_htonll (opc->id);
GNUNET_CONTAINER_DLL_insert_tail (opc->c->ocq_head, opc->c->ocq_tail, opc);
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.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER);
msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerStopMessage));
msg->peer_id = htonl (peer->unique_id);
msg->operation_id = GNUNET_htonll (opc->id);
(struct GNUNET_TESTBED_PeerGetConfigurationMessage));
msg->header.size =
htons (sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage));
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_GETPEERCONFIG);
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_CONFIGURATION);
msg->peer_id = htonl (peer_id);
msg->operation_id = GNUNET_htonll (operation_id);
return msg;
opc->state = OPC_STATE_STARTED;
data = opc->data;
GNUNET_assert (NULL != data);
- data->tslot_index = GNUNET_TESTBED_get_tslot_ (opc->c, data);
+ data->tslot_index = GNUNET_TESTBED_get_tslot_ (data->p1->host, data);
data->tstart = GNUNET_TIME_absolute_get ();
msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_OverlayConnectMessage));
msg->header.size =
htons (sizeof (struct GNUNET_TESTBED_OverlayConnectMessage));
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_OLCONNECT);
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_OVERLAY_CONNECT);
msg->peer1 = htonl (data->p1->unique_id);
msg->peer2 = htonl (data->p2->unique_id);
msg->operation_id = GNUNET_htonll (opc->id);
case OPC_STATE_INIT:
break;
case OPC_STATE_STARTED:
- (void) GNUNET_TESTBED_release_time_slot_ (opc->c, data->tslot_index, data);
+ (void) GNUNET_TESTBED_release_time_slot_ (data->p1->host, data->tslot_index,
+ data);
GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
break;
case OPC_STATE_FINISHED:
duration = GNUNET_TIME_absolute_get_duration (data->tstart);
- GNUNET_TESTBED_update_time_slot_ (opc->c, data->tslot_index,
- data, duration);
+ GNUNET_TESTBED_update_time_slot_ (data->p1->host, data->tslot_index, data,
+ duration, data->failed);
}
GNUNET_free (data);
GNUNET_free (opc);
const struct GNUNET_CONFIGURATION_Handle *cfg,
GNUNET_TESTBED_PeerCreateCallback cb, void *cls)
{
-
+
struct GNUNET_TESTBED_Peer *peer;
struct PeerCreateData *data;
struct OperationContext *opc;
* @return handle to the operation
*/
struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_start (void *op_cls,
- struct GNUNET_TESTBED_Peer *peer,
- GNUNET_TESTBED_PeerChurnCallback pcc,
- void *pcc_cls)
+GNUNET_TESTBED_peer_start (void *op_cls, struct GNUNET_TESTBED_Peer *peer,
+ GNUNET_TESTBED_PeerChurnCallback pcc, void *pcc_cls)
{
struct OperationContext *opc;
struct PeerEventData *data;
-
+
data = GNUNET_malloc (sizeof (struct PeerEventData));
data->peer = peer;
data->pcc = pcc;
*/
struct GNUNET_TESTBED_Operation *
GNUNET_TESTBED_peer_stop (struct GNUNET_TESTBED_Peer *peer,
- GNUNET_TESTBED_PeerChurnCallback pcc,
- void *pcc_cls)
+ GNUNET_TESTBED_PeerChurnCallback pcc, void *pcc_cls)
{
struct OperationContext *opc;
struct PeerEventData *data;
-
+
data = GNUNET_malloc (sizeof (struct PeerEventData));
data->peer = peer;
data->pcc = pcc;
*/
struct GNUNET_TESTBED_Operation *
GNUNET_TESTBED_peer_get_information (struct GNUNET_TESTBED_Peer *peer,
- enum GNUNET_TESTBED_PeerInformationType
- pit,
- GNUNET_TESTBED_PeerInfoCallback cb,
- void *cb_cls)
+ enum GNUNET_TESTBED_PeerInformationType
+ pit, GNUNET_TESTBED_PeerInfoCallback cb,
+ void *cb_cls)
{
struct OperationContext *opc;
struct PeerInfoData *data;
struct GNUNET_TESTBED_Operation *
GNUNET_TESTBED_overlay_connect (void *op_cls,
GNUNET_TESTBED_OperationCompletionCallback cb,
- void *cb_cls,
- struct GNUNET_TESTBED_Peer *p1,
- struct GNUNET_TESTBED_Peer *p2)
+ void *cb_cls, struct GNUNET_TESTBED_Peer *p1,
+ struct GNUNET_TESTBED_Peer *p2)
{
struct OperationContext *opc;
struct OverlayConnectData *data;
opc->op =
GNUNET_TESTBED_operation_create_ (opc, &opstart_overlay_connect,
&oprelease_overlay_connect);
- GNUNET_TESTBED_operation_queue_insert_
- (opc->c->opq_parallel_overlay_connect_operations, opc->op);
+ GNUNET_TESTBED_host_queue_oc (p1->host, opc->op);
GNUNET_TESTBED_operation_begin_wait_ (opc->op);
return opc->op;
}