X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftestbed%2Ftestbed_api_testbed.c;h=2be565e63c182a5fe3292eb709bd8f402b516580;hb=8a2d1e6aedbf1bc95052e63ac67093b89385b0a1;hp=2f5fc70e859fbc9dfb1c2d243c0003ba4a5d5c38;hpb=d27d2a9ba2026c1cc4f137490d6bf40073026a05;p=oweals%2Fgnunet.git

diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 2f5fc70e8..2be565e63 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -338,7 +338,7 @@ struct GNUNET_TESTBED_RunHandle
  */
 static uint32_t
 rcop_key (void *rcop)
-{  
+{
   return * ((uint32_t *) &rcop);
 }
 
@@ -397,10 +397,10 @@ static struct RunContextOperation *
 search_rcop (struct GNUNET_TESTBED_RunHandle *rc, struct GNUNET_TESTBED_Operation *op)
 {
   struct SearchContext sc;
-  
+
   sc.query = op;
   sc.result = NULL;
-  if (GNUNET_SYSERR == 
+  if (GNUNET_SYSERR ==
       GNUNET_CONTAINER_multihashmap32_get_multiple (rc->rcop_map,
                                                     rcop_key (op),
                                                     &search_iterator,
@@ -448,12 +448,11 @@ remove_rcop (struct GNUNET_TESTBED_RunHandle *rc, struct RunContextOperation *rc
 /**
  * Assuming all peers have been destroyed cleanup run handle
  *
- * @param cls the run handle
+ * @param rc the run context
  */
 static void
-cleanup (void *cls)
+cleanup (struct GNUNET_TESTBED_RunHandle *rc)
 {
-  struct GNUNET_TESTBED_RunHandle *rc = cls;
   unsigned int hid;
 
   GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == rc->register_hosts_task);
@@ -481,7 +480,7 @@ cleanup (void *cls)
 
 
 /**
- * Iterator for cleaning up elements from rcop_map 
+ * Iterator for cleaning up elements from rcop_map
  *
  * @param cls the RunContext
  * @param key the 32-bit key
@@ -546,7 +545,7 @@ rc_cleanup_operations (struct GNUNET_TESTBED_RunHandle *rc)
     rc->topology_operation = NULL;
   }
   /* cancel any exiting operations */
-  GNUNET_assert (GNUNET_SYSERR != 
+  GNUNET_assert (GNUNET_SYSERR !=
                  GNUNET_CONTAINER_multihashmap32_iterate (rc->rcop_map,
                                                           &rcop_cleanup_iterator,
                                                           rc));
@@ -568,7 +567,7 @@ cancel_interrupt_task (struct GNUNET_TESTBED_RunHandle *rc)
 
 /**
  * This callback will be called when all the operations are completed
- * (done/cancelled) 
+ * (done/cancelled)
  *
  * @param cls run context
  */
@@ -592,7 +591,7 @@ wait_op_completion (void *cls)
   if (NULL == rc->peers)
     goto cleanup_;
   rc->shutdown = GNUNET_YES;
-  rcop = GNUNET_malloc (sizeof (struct RunContextOperation));
+  rcop = GNUNET_new (struct RunContextOperation);
   rcop->rc = rc;
   rcop->op = GNUNET_TESTBED_shutdown_peers (rc->c, rcop, NULL, NULL);
   GNUNET_assert (NULL != rcop->op);
@@ -624,9 +623,9 @@ interrupt (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   /* reschedule */
   rc->interrupt_task = GNUNET_SCHEDULER_add_delayed
       (GNUNET_TIME_UNIT_FOREVER_REL, &interrupt, rc);
-  rc_cleanup_operations (rc);  
+  rc_cleanup_operations (rc);
   if ( (GNUNET_NO == rc->shutdown)
-       && (NULL != c) 
+       && (NULL != c)
        && (0 != (size = GNUNET_CONTAINER_multihashmap32_size (c->opc_map))))
   {
     LOG (GNUNET_ERROR_TYPE_WARNING, "Shutdown postponed as there are "
@@ -673,7 +672,7 @@ start_peers_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   rc->pstart_time = GNUNET_TIME_absolute_get ();
   for (peer = 0; peer < rc->num_peers; peer++)
   {
-    rcop = GNUNET_malloc (sizeof (struct RunContextOperation));
+    rcop = GNUNET_new (struct RunContextOperation);
     rcop->rc = rc;
     rcop->op  = GNUNET_TESTBED_peer_start (NULL, rc->peers[peer], NULL, NULL);
     GNUNET_assert (NULL != rcop->op);
@@ -782,7 +781,7 @@ create_peers (struct GNUNET_TESTBED_RunHandle *rc)
   rc->peer_count = 0;
   for (peer = 0; peer < rc->num_peers; peer++)
   {
-    rcop = GNUNET_malloc (sizeof (struct RunContextOperation));
+    rcop = GNUNET_new (struct RunContextOperation);
     rcop->rc = rc;
     rcop->op =
         GNUNET_TESTBED_peer_create (rc->c,
@@ -917,7 +916,7 @@ call_cc:
       {
         unsigned long long number;
         unsigned int cap;
-        GNUNET_assert (GNUNET_OK == 
+        GNUNET_assert (GNUNET_OK ==
                        GNUNET_CONFIGURATION_get_value_number (rc->cfg, TESTBED_CONFIG_SECTION,
                                                               SCALE_FREE_CAP,
                                                               &number));
@@ -1014,7 +1013,7 @@ register_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     /* Start slaves */
     for (slave = 0; slave < rc->num_hosts; slave++)
     {
-      rcop = GNUNET_malloc (sizeof (struct RunContextOperation));
+      rcop = GNUNET_new (struct RunContextOperation);
       rcop->rc = rc;
       rcop->op =
           GNUNET_TESTBED_controller_link (rcop, rc->c, rc->hosts[slave],
@@ -1199,7 +1198,7 @@ static void
 timeout_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_TESTBED_RunHandle *rc = cls;
-  
+
   rc->timeout_task = GNUNET_SCHEDULER_NO_TASK;
   LOG (GNUNET_ERROR_TYPE_ERROR, _("Shutting down testbed due to timeout while setup.\n"));
    GNUNET_SCHEDULER_shutdown ();
@@ -1246,16 +1245,16 @@ GNUNET_TESTBED_run (const char *host_filename,
 {
   struct GNUNET_TESTBED_RunHandle *rc;
   char *topology;
-  struct CompatibilityCheckContext *hc;      
+  struct CompatibilityCheckContext *hc;
   struct GNUNET_TIME_Relative timeout;
   unsigned long long number;
   unsigned int hid;
   unsigned int nhost;
 
   GNUNET_assert (num_peers > 0);
-  rc = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_RunHandle));
+  rc = GNUNET_new (struct GNUNET_TESTBED_RunHandle);
   rc->cfg = GNUNET_CONFIGURATION_dup (cfg);
-#if ENABLE_LL
+#if ENABLE_SUPERMUC
   rc->num_hosts = GNUNET_TESTBED_hosts_load_from_loadleveler (rc->cfg,
                                                               &rc->hosts);
   if (0 == rc->num_hosts)
@@ -1326,7 +1325,7 @@ GNUNET_TESTBED_run (const char *host_filename,
     break;
   case GNUNET_TESTBED_TOPOLOGY_FROM_FILE:
     if (GNUNET_OK !=
-        GNUNET_CONFIGURATION_get_value_string (rc->cfg, TESTBED_CONFIG_SECTION,
+        GNUNET_CONFIGURATION_get_value_filename (rc->cfg, TESTBED_CONFIG_SECTION,
                                                "OVERLAY_TOPOLOGY_FILE",
                                                &rc->topo_file))
     {