};
-/**
- * The message queue for sending messages to the controller service
- */
-struct MessageQueue;
-
/**
* 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
- */
+ /**
+ * 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.
- */
+ /**
+ * 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
- */
+ /**
+ * 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
};
struct GNUNET_CONFIGURATION_Handle *cfg;
/**
- * The client connection handle to the controller service
- */
- struct GNUNET_CLIENT_Connection *client;
-
- /**
- * The head of the message queue
- */
- struct MessageQueue *mq_head;
-
- /**
- * The tail of the message queue
+ * The message queue to the controller service
*/
- struct MessageQueue *mq_tail;
-
- /**
- * The client transmit handle
- */
- struct GNUNET_CLIENT_TransmitHandle *th;
+ struct GNUNET_MQ_Handle *mq;
/**
* The host registration handle; NULL if no current registration requests are
*/
uint64_t event_mask;
- /**
- * Did we start the receive loop yet?
- */
- int in_receive;
-
/**
* The operation id counter. use current value and increment
*/
*
* @param controller the handle to the controller
* @param msg the message to queue
+ * @deprecated
*/
void
GNUNET_TESTBED_queue_message_ (struct GNUNET_TESTBED_Controller *controller,
* @return the size of the xconfig
*/
size_t
-GNUNET_TESTBED_compress_config_ (const char *config, size_t size,
+GNUNET_TESTBED_compress_config_ (const char *config,
+ size_t size,
char **xconfig);
*/
char *
GNUNET_TESTBED_compress_cfg_ (const struct GNUNET_CONFIGURATION_Handle *cfg,
- size_t *size, size_t *xsize);
+ size_t *size,
+ size_t *xsize);
/**
* @return the initialization message
*/
struct GNUNET_TESTBED_HelperInit *
-GNUNET_TESTBED_create_helper_init_msg_ (const char *cname, const char *hostname,
- const struct GNUNET_CONFIGURATION_Handle
- *cfg);
+GNUNET_TESTBED_create_helper_init_msg_ (const char *cname,
+ const char *hostname,
+ const struct GNUNET_CONFIGURATION_Handle *cfg);
/**
* operation
*/
struct OperationContext *
-GNUNET_TESTBED_forward_operation_msg_ (struct GNUNET_TESTBED_Controller
- *controller, uint64_t operation_id,
+GNUNET_TESTBED_forward_operation_msg_ (struct GNUNET_TESTBED_Controller *controller,
+ uint64_t operation_id,
const struct GNUNET_MessageHeader *msg,
GNUNET_CLIENT_MessageHandler cc,
void *cc_cls);
/**
* Generates configuration by uncompressing configuration in given message. The
* given message should be of the following types:
- * GNUNET_MESSAGE_TYPE_TESTBED_PEERCONFIG,
- * GNUNET_MESSAGE_TYPE_TESTBED_SLAVECONFIG
+ * #GNUNET_MESSAGE_TYPE_TESTBED_PEERCONFIG,
+ * #GNUNET_MESSAGE_TYPE_TESTBED_SLAVECONFIG
*
* @param msg the message containing compressed configuration
* @return handle to the parsed configuration
* @return the error message
*/
const char *
-GNUNET_TESTBED_parse_error_string_ (const struct
- GNUNET_TESTBED_OperationFailureEventMessage
- *msg);
+GNUNET_TESTBED_parse_error_string_ (const struct GNUNET_TESTBED_OperationFailureEventMessage *msg);
/**
uint32_t slave_host_id);
+
+/**
+ * Initialise a barrier and call the given callback when the required percentage
+ * of peers (quorum) reach the barrier OR upon error.
+ *
+ * @param controller the handle to the controller
+ * @param name identification name of the barrier
+ * @param quorum the percentage of peers that is required to reach the barrier.
+ * Peers signal reaching a barrier by calling
+ * GNUNET_TESTBED_barrier_reached().
+ * @param cb the callback to call when the barrier is reached or upon error.
+ * Cannot be NULL.
+ * @param cls closure for the above callback
+ * @param echo #GNUNET_YES to echo the barrier crossed status message back to the
+ * controller
+ * @return barrier handle; NULL upon error
+ */
+struct GNUNET_TESTBED_Barrier *
+GNUNET_TESTBED_barrier_init_ (struct GNUNET_TESTBED_Controller *controller,
+ const char *name,
+ unsigned int quorum,
+ GNUNET_TESTBED_barrier_status_cb cb,
+ void *cls,
+ int echo);
+
+
+/**
+ * Remove a barrier and it was the last one in the barrier hash map, destroy the
+ * hash map
+ *
+ * @param barrier the barrier to remove
+ */
+void
+GNUNET_TESTBED_barrier_remove_ (struct GNUNET_TESTBED_Barrier *barrier);
+
+
+
#endif
/* end of testbed_api.h */