- opaque mq structs

- mq for mesh
- faster hashing for IBFs
- mesh replaces stream in set
- new set profiler (work in progress)

1 files changed, 64 insertions, 255 deletions

diff --git a/src/consensus/consensus_api.c b/src/consensus/consensus_api.c
index e3ddb4913..684580755 100644
--- a/src/consensus/consensus_api.c
+++ b/src/consensus/consensus_api.c
@@ -33,37 +33,6 @@
 
 #define LOG(kind,...) GNUNET_log_from (kind, "consensus-api",__VA_ARGS__)
 
-/**
- * Actions that can be queued.
- */
-struct QueuedMessage
-{
-  /**
-   * Queued messages are stored in a doubly linked list.
-   */
-  struct QueuedMessage *next;
-
-  /**
-   * Queued messages are stored in a doubly linked list.
-   */
-  struct QueuedMessage *prev;
-
-  /**
-   * The actual queued message.
-   */
-  struct GNUNET_MessageHeader *msg;
-
-  /**
-   * Will be called after transmit, if not NULL
-   */
-  GNUNET_CONSENSUS_InsertDoneCallback idc;
-
-  /**
-   * Closure for idc
-   */
-  void *idc_cls;
-};
-
 
 /**
  * Handle for the service.
@@ -106,21 +75,11 @@ struct GNUNET_CONSENSUS_Handle
   struct GNUNET_PeerIdentity **peers;
 
   /**
-   * Currently active transmit request.
-   */
-  struct GNUNET_CLIENT_TransmitHandle *th;
-
-  /**
    * GNUNES_YES iff the join message has been sent to the service.
    */
   int joined;
 
   /**
-   * Closure for the insert done callback.
-   */
-  void *idc_cls;
-
-  /**
    * Called when the conclude operation finishes or fails.
    */
   GNUNET_CONSENSUS_ConcludeCallback conclude_cb;
@@ -135,109 +94,36 @@ struct GNUNET_CONSENSUS_Handle
    */
   struct GNUNET_TIME_Absolute conclude_deadline;
 
-  unsigned int conclude_min_size;
-
-  struct QueuedMessage *messages_head;
-
-  struct QueuedMessage *messages_tail;
-
+  /**
+   * Message queue for the client.
+   */
+  struct GNUNET_MQ_Handle *mq;
 };
 
-
-
 /**
- * Schedule transmitting the next message.
- *
- * @param consensus consensus handle
+ * FIXME: this should not bee necessary when the API
+ * issue has been fixed
  */
-static void
-send_next (struct GNUNET_CONSENSUS_Handle *consensus);
-
-
-/**
- * Function called to notify a client about the connection
- * begin ready to queue more data.  "buf" will be
- * NULL and "size" zero if the connection was closed for
- * writing in the meantime.
- *
- * @param cls closure
- * @param size number of bytes available in buf
- * @param buf where the callee should write the message
- * @return number of bytes written to buf
- */
-static size_t
-transmit_queued (void *cls, size_t size,
-                 void *buf)
+struct InsertDoneInfo
 {
-  struct GNUNET_CONSENSUS_Handle *consensus;
-  struct QueuedMessage *qmsg;
-  size_t msg_size;
-
-  consensus = (struct GNUNET_CONSENSUS_Handle *) cls;
-  consensus->th = NULL;
-
-  qmsg = consensus->messages_head;
-  GNUNET_CONTAINER_DLL_remove (consensus->messages_head, consensus->messages_tail, qmsg);
-
-  if (NULL == buf)
-  {
-    if (NULL != qmsg->idc)
-    {
-      qmsg->idc (qmsg->idc_cls, GNUNET_YES);
-    }
-    return 0;
-  }
-
-  msg_size = ntohs (qmsg->msg->size);
-
-  GNUNET_assert (size >= msg_size);
-
-  memcpy (buf, qmsg->msg, msg_size);
-  if (NULL != qmsg->idc)
-  {
-    qmsg->idc (qmsg->idc_cls, GNUNET_YES);
-  }
-  GNUNET_free (qmsg->msg);
-  GNUNET_free (qmsg);
-  /* FIXME: free the messages */
-
-  send_next (consensus);
-
-  return msg_size;
-}
-
-
-/**
- * Schedule transmitting the next message.
- *
- * @param consensus consensus handle
- */
-static void
-send_next (struct GNUNET_CONSENSUS_Handle *consensus)
-{
-  if (NULL != consensus->th)
-    return;
-
-  if (NULL != consensus->messages_head)
-  {
-    consensus->th = 
-        GNUNET_CLIENT_notify_transmit_ready (consensus->client, ntohs (consensus->messages_head->msg->size),
-                                             GNUNET_TIME_UNIT_FOREVER_REL,
-                                             GNUNET_NO, &transmit_queued, consensus);
-  }
-}
+  GNUNET_CONSENSUS_InsertDoneCallback idc;
+  void *cls;
+};
 
 
 /**
  * Called when the server has sent is a new element
  * 
- * @param consensus consensus handle
- * @param msg element message
+ * @param cls consensus handle
+ * @param mh element message
  */
 static void
-handle_new_element (struct GNUNET_CONSENSUS_Handle *consensus,
-                    struct GNUNET_CONSENSUS_ElementMessage *msg)
+handle_new_element (void *cls,
+                    const struct GNUNET_MessageHeader *mh)
 {
+  struct GNUNET_CONSENSUS_Handle *consensus = cls;
+  const struct GNUNET_CONSENSUS_ElementMessage *msg
+      = (const struct GNUNET_CONSENSUS_ElementMessage *) mh;
   struct GNUNET_SET_Element element;
 
   LOG (GNUNET_ERROR_TYPE_DEBUG, "received new element\n");
@@ -247,8 +133,6 @@ handle_new_element (struct GNUNET_CONSENSUS_Handle *consensus,
   element.data = &msg[1];
 
   consensus->new_element_cb (consensus->new_element_cls, &element);
-
-  send_next (consensus);
 }
 
 
@@ -256,13 +140,15 @@ handle_new_element (struct GNUNET_CONSENSUS_Handle *consensus,
  * Called when the server has announced
  * that the conclusion is over.
  * 
- * @param consensus consensus handle
- * @param msg conclude done message
+ * @param cls consensus handle
+ * @param mh conclude done message
  */
 static void
-handle_conclude_done (struct GNUNET_CONSENSUS_Handle *consensus,
+handle_conclude_done (void *cls,
                       const struct GNUNET_MessageHeader *msg)
 {
+  struct GNUNET_CONSENSUS_Handle *consensus = cls;
+
   GNUNET_CONSENSUS_ConcludeCallback cc;
 
   GNUNET_assert (NULL != (cc = consensus->conclude_cb));
@@ -272,89 +158,6 @@ handle_conclude_done (struct GNUNET_CONSENSUS_Handle *consensus,
 
 
 /**
- * Type of a function to call when we receive a message
- * from the service.
- *
- * @param cls closure
- * @param msg message received, NULL on timeout or fatal error
- */
-static void
-message_handler (void *cls, const struct GNUNET_MessageHeader *msg)
-{
-  struct GNUNET_CONSENSUS_Handle *consensus = cls;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "received message from consensus service\n");
-
-  if (NULL == msg)
-  {
-    /* Error, timeout, death */
-    LOG (GNUNET_ERROR_TYPE_ERROR, "error receiving\n");
-    GNUNET_CLIENT_disconnect (consensus->client);
-    consensus->client = NULL;
-    consensus->new_element_cb (consensus->new_element_cls, NULL);
-    return;
-  }
-  GNUNET_CLIENT_receive (consensus->client, &message_handler, consensus,
-                         GNUNET_TIME_UNIT_FOREVER_REL);
-  switch (ntohs (msg->type))
-  {
-    case GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_RECEIVED_ELEMENT:
-      handle_new_element (consensus, (struct GNUNET_CONSENSUS_ElementMessage *) msg);
-      break;
-    case GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE_DONE:
-      handle_conclude_done (consensus, msg);
-      break;
-    default:
-      GNUNET_break (0);
-  }
-}
-
-/**
- * Function called to notify a client about the connection
- * begin ready to queue more data.  "buf" will be
- * NULL and "size" zero if the connection was closed for
- * writing in the meantime.
- *
- * @param cls closure
- * @param size number of bytes available in buf
- * @param buf where the callee should write the message
- * @return number of bytes written to buf
- */
-static size_t
-transmit_join (void *cls, size_t size, void *buf)
-{
-  struct GNUNET_CONSENSUS_JoinMessage *msg;
-  struct GNUNET_CONSENSUS_Handle *consensus;
-  int msize;
-
-  GNUNET_assert (NULL != buf);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "transmitting join message\n");
-
-  consensus = cls;
-  consensus->th = NULL;
-  consensus->joined = 1;
-
-  msg = buf;
-
-  msize = sizeof (struct GNUNET_CONSENSUS_JoinMessage) +
-      consensus->num_peers * sizeof (struct GNUNET_PeerIdentity);
-
-  msg->header.type = htons (GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_JOIN);
-  msg->header.size = htons (msize);
-  msg->session_id = consensus->session_id;
-  msg->num_peers = htonl (consensus->num_peers);
-  memcpy(&msg[1],
-         consensus->peers,
-         consensus->num_peers * sizeof (struct GNUNET_PeerIdentity));
-  send_next (consensus);
-  GNUNET_CLIENT_receive (consensus->client, &message_handler, consensus,
-                         GNUNET_TIME_UNIT_FOREVER_REL);
-  
-  return msize;
-}
-
-/**
  * Create a consensus session.
  *
  * @param cfg configuration to use for connecting to the consensus service
@@ -377,7 +180,15 @@ GNUNET_CONSENSUS_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
                          void *new_element_cls)
 {
   struct GNUNET_CONSENSUS_Handle *consensus;
-  size_t join_message_size;
+  struct GNUNET_CONSENSUS_JoinMessage *join_msg;
+  struct GNUNET_MQ_Envelope *ev;
+  const static struct GNUNET_MQ_MessageHandler mq_handlers[] = {
+    {handle_new_element,
+      GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_RECEIVED_ELEMENT, 0},
+    {handle_conclude_done,
+      GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE_DONE, 0},
+    GNUNET_MQ_HANDLERS_END
+  };
 
   consensus = GNUNET_malloc (sizeof (struct GNUNET_CONSENSUS_Handle));
   consensus->cfg = cfg;
@@ -393,24 +204,33 @@ GNUNET_CONSENSUS_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
         GNUNET_memdup (peers, num_peers * sizeof (struct GNUNET_PeerIdentity));
 
   consensus->client = GNUNET_CLIENT_connect ("consensus", cfg);
+  consensus->mq = GNUNET_MQ_queue_for_connection_client (consensus->client,
+                                                         mq_handlers, consensus);
 
   GNUNET_assert (consensus->client != NULL);
 
-  join_message_size = (sizeof (struct GNUNET_CONSENSUS_JoinMessage)) +
-      (num_peers * sizeof (struct GNUNET_PeerIdentity));
-
-  consensus->th =
-      GNUNET_CLIENT_notify_transmit_ready (consensus->client,
-                                           join_message_size,
-                                           GNUNET_TIME_UNIT_FOREVER_REL,
-                                           GNUNET_NO, &transmit_join, consensus);
+  ev = GNUNET_MQ_msg_extra (join_msg,
+                            (num_peers * sizeof (struct GNUNET_PeerIdentity)),
+                            GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_JOIN);
 
+  join_msg->session_id = consensus->session_id;
+  join_msg->num_peers = htonl (consensus->num_peers);
+  memcpy(&join_msg[1],
+         consensus->peers,
+         consensus->num_peers * sizeof (struct GNUNET_PeerIdentity));
 
-  GNUNET_assert (consensus->th != NULL);
+  GNUNET_MQ_send (consensus->mq, ev);
   return consensus;
 }
 
 
+static void
+idc_adapter (void *cls)
+{
+  struct InsertDoneInfo *i = cls;
+  i->idc (i->cls, GNUNET_OK);
+  GNUNET_free (i);
+}
 
 /**
  * Insert an element in the set being reconsiled.  Must not be called after
@@ -428,28 +248,24 @@ GNUNET_CONSENSUS_insert (struct GNUNET_CONSENSUS_Handle *consensus,
                          GNUNET_CONSENSUS_InsertDoneCallback idc,
                          void *idc_cls)
 {
-  struct QueuedMessage *qmsg;
   struct GNUNET_CONSENSUS_ElementMessage *element_msg;
-  size_t element_msg_size;
+  struct GNUNET_MQ_Envelope *ev;
+  struct InsertDoneInfo *i;
 
   LOG (GNUNET_ERROR_TYPE_DEBUG, "inserting, size=%llu\n", element->size);
 
-  element_msg_size = (sizeof (struct GNUNET_CONSENSUS_ElementMessage) +
-                               element->size);
+  ev = GNUNET_MQ_msg_extra (element_msg, element->size,
+                            GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_INSERT);
 
-  element_msg = GNUNET_malloc (element_msg_size);
-  element_msg->header.type = htons (GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_INSERT);
-  element_msg->header.size = htons (element_msg_size);
   memcpy (&element_msg[1], element->data, element->size);
-
-  qmsg = GNUNET_malloc (sizeof (struct QueuedMessage));
-  qmsg->msg = (struct GNUNET_MessageHeader *) element_msg;
-  qmsg->idc = idc;
-  qmsg->idc_cls = idc_cls;
-
-  GNUNET_CONTAINER_DLL_insert_tail (consensus->messages_head, consensus->messages_tail, qmsg);
-
-  send_next (consensus);
+  
+  if (NULL != idc)
+  {
+    i = GNUNET_new (struct InsertDoneInfo);
+    i->idc = idc;
+    i->cls = idc_cls;
+    GNUNET_MQ_notify_sent (ev, idc_adapter, i);
+  }
 }
 
 
@@ -471,7 +287,7 @@ GNUNET_CONSENSUS_conclude (struct GNUNET_CONSENSUS_Handle *consensus,
                            GNUNET_CONSENSUS_ConcludeCallback conclude,
                            void *conclude_cls)
 {
-  struct QueuedMessage *qmsg;
+  struct GNUNET_MQ_Envelope *ev;
   struct GNUNET_CONSENSUS_ConcludeMessage *conclude_msg;
 
   GNUNET_assert (NULL != conclude);
@@ -480,17 +296,10 @@ GNUNET_CONSENSUS_conclude (struct GNUNET_CONSENSUS_Handle *consensus,
   consensus->conclude_cls = conclude_cls;
   consensus->conclude_cb = conclude;
 
-  conclude_msg = GNUNET_malloc (sizeof (struct GNUNET_CONSENSUS_ConcludeMessage));
-  conclude_msg->header.type = htons (GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE);
-  conclude_msg->header.size = htons (sizeof (struct GNUNET_CONSENSUS_ConcludeMessage));
+  ev = GNUNET_MQ_msg (conclude_msg, GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE);
   conclude_msg->timeout = GNUNET_TIME_relative_hton (timeout);
 
-  qmsg = GNUNET_malloc (sizeof (struct QueuedMessage));
-  qmsg->msg = (struct GNUNET_MessageHeader *) conclude_msg;
-
-  GNUNET_CONTAINER_DLL_insert_tail (consensus->messages_head, consensus->messages_tail, qmsg);
-
-  send_next (consensus);
+  GNUNET_MQ_send (consensus->mq, ev);
 }