-more datacache integration work

[oweals/gnunet.git] / src / testbed / testbed_api_barriers.c

diff --git a/src/testbed/testbed_api_barriers.c b/src/testbed/testbed_api_barriers.c
index 9c7ee533c3a9dd798cac08323cfb4d2338bdad9d..8ac3fdab549e2addbd9e11829b4dc6f9e708a9f6 100644 (file)
--- a/src/testbed/testbed_api_barriers.c
+++ b/src/testbed/testbed_api_barriers.c
@@ -1,6 +1,6 @@
 /*
   This file is part of GNUnet.
-  (C) 2008--2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2008--2013 Christian Grothoff (and other contributing authors)
 
   GNUnet is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published
@@ -21,7 +21,7 @@
 /**
  * @file testbed/testbed_api_barriers.c
  * @brief API implementation for testbed barriers
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
 
 #include "platform.h"
@@ -55,7 +55,7 @@ struct GNUNET_TESTBED_Barrier
    * The controller handle given while initiliasing this barrier
    */
   struct GNUNET_TESTBED_Controller *c;
-  
+
   /**
    * The name of the barrier
    */
@@ -70,7 +70,7 @@ struct GNUNET_TESTBED_Barrier
    * the closure for the above callback
    */
   void *cls;
- 
+
   /**
    * Should the barrier crossed status message be echoed back to the controller?
    */
@@ -125,15 +125,15 @@ GNUNET_TESTBED_handle_barrier_status_ (struct GNUNET_TESTBED_Controller *c,
   struct GNUNET_TESTBED_Barrier *barrier;
   char *emsg;
   const char *name;
-  struct GNUNET_HashCode key;  
+  struct GNUNET_HashCode key;
   size_t emsg_len;
   int status;
   uint16_t msize;
   uint16_t name_len;
-  
+
   emsg = NULL;
   barrier = NULL;
-  msize = ntohs (msg->header.size);  
+  msize = ntohs (msg->header.size);
   name = msg->data;
   name_len = ntohs (msg->name_len);
   LOG_DEBUG ("Received BARRIER_STATUS msg\n");
@@ -148,7 +148,7 @@ GNUNET_TESTBED_handle_barrier_status_ (struct GNUNET_TESTBED_Controller *c,
     return GNUNET_SYSERR;
   }
   status = ntohs (msg->status);
-  if (BARRIER_STATUS_ERROR == status)
+  if (GNUNET_TESTBED_BARRIERSTATUS_ERROR == status)
   {
     status = -1;
     emsg_len = msize - (sizeof (struct GNUNET_TESTBED_BarrierStatusMsg) + name_len
@@ -177,10 +177,10 @@ GNUNET_TESTBED_handle_barrier_status_ (struct GNUNET_TESTBED_Controller *c,
     goto cleanup;
   }
   GNUNET_assert (NULL != barrier->cb);
-  if ((GNUNET_YES == barrier->echo) && (BARRIER_STATUS_CROSSED == status))
+  if ((GNUNET_YES == barrier->echo) && (GNUNET_TESTBED_BARRIERSTATUS_CROSSED == status))
     GNUNET_TESTBED_queue_message_ (c, GNUNET_copy_message (&msg->header));
   barrier->cb (barrier->cls, name, barrier, status, emsg);
-  if (BARRIER_STATUS_INITIALISED == status)
+  if (GNUNET_TESTBED_BARRIERSTATUS_INITIALISED == status)
     return GNUNET_OK;           /* just initialised; skip cleanup */
 
  cleanup:
@@ -219,7 +219,7 @@ GNUNET_TESTBED_barrier_init_ (struct GNUNET_TESTBED_Controller *controller,
   struct GNUNET_HashCode key;
   size_t name_len;
   uint16_t msize;
-  
+
   GNUNET_assert (quorum <= 100);
   GNUNET_assert (NULL != cb);
   name_len = strlen (name);
@@ -234,7 +234,7 @@ GNUNET_TESTBED_barrier_init_ (struct GNUNET_TESTBED_Controller *controller,
     return NULL;
   }
   LOG_DEBUG ("Initialising barrier `%s'\n", name);
-  barrier = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Barrier));
+  barrier = GNUNET_new (struct GNUNET_TESTBED_Barrier);
   barrier->c = controller;
   barrier->name = GNUNET_strdup (name);
   barrier->cb = cb;
@@ -310,11 +310,11 @@ struct GNUNET_TESTBED_BarrierWaitHandle
    * The name of the barrier
    */
   char *name;
-  
+
   /**
    * Then configuration used for the client connection
    */
-  struct GNUNET_CONFIGURATION_Handle *cfg;  
+  struct GNUNET_CONFIGURATION_Handle *cfg;
 
   /**
    * The client connection
@@ -376,7 +376,7 @@ receive_handler (void *cls, const struct GNUNET_MessageHeader *message)
   struct GNUNET_TESTBED_BarrierWaitHandle *h = cls;
   const struct GNUNET_TESTBED_BarrierStatusMsg *msg;
   uint16_t msize;
-  
+
   if (NULL == message)
   {
     GNUNET_break_op (0);
@@ -386,22 +386,22 @@ receive_handler (void *cls, const struct GNUNET_MessageHeader *message)
   {
     GNUNET_break_op (0);
     goto fail;
-  } 
+  }
   msize = ntohs (message->size);
   if (msize <= sizeof (struct GNUNET_TESTBED_BarrierStatusMsg))
   {
     GNUNET_break_op (0);
     goto fail;
-  } 
+  }
   msg = (const struct GNUNET_TESTBED_BarrierStatusMsg *) message;
   switch (ntohs (msg->status))
   {
-  case BARRIER_STATUS_ERROR:
+  case GNUNET_TESTBED_BARRIERSTATUS_ERROR:
     goto fail;
-  case BARRIER_STATUS_INITIALISED:
+  case GNUNET_TESTBED_BARRIERSTATUS_INITIALISED:
     GNUNET_break (0);           /* FIXME */
     goto destroy;
-  case BARRIER_STATUS_CROSSED:
+  case GNUNET_TESTBED_BARRIERSTATUS_CROSSED:
     h->cb (h->cls, h->name, GNUNET_OK);
     goto destroy;
   default:
@@ -432,7 +432,7 @@ transmit_notify (void *cls, size_t size, void *buf)
 {
   struct GNUNET_TESTBED_BarrierWaitHandle *h = cls;
   uint16_t msize;
-  
+
   h->tx = NULL;
   if ((0 == size) || (NULL == buf))
   {
@@ -488,7 +488,7 @@ GNUNET_TESTBED_barrier_wait (const char *name,
     GNUNET_CONFIGURATION_destroy (cfg);
     return NULL;
   }
-  h = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_BarrierWaitHandle));
+  h = GNUNET_new (struct GNUNET_TESTBED_BarrierWaitHandle);
   h->name = GNUNET_strdup (name);
   h->cfg = cfg;
   h->conn = GNUNET_CLIENT_connect ("testbed-barrier", h->cfg);
@@ -507,7 +507,7 @@ GNUNET_TESTBED_barrier_wait (const char *name,
   msg->header.size = htons (msize);
   (void) memcpy (msg->name, name, name_len);
   h->msg = &msg->header;
-  h->tx = 
+  h->tx =
       GNUNET_CLIENT_notify_transmit_ready (h->conn, msize,
                                            GNUNET_TIME_UNIT_FOREVER_REL,
                                            GNUNET_NO,