- verboser log, faster start

[oweals/gnunet.git] / src / testbed / testbed_api.h

diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h
index ed5b38b1dad340333f0fe96a4cb44745cd890eb2..26b0d5843fa5b06cf3def7de74f0c0a42cfc42d6 100644 (file)
--- a/src/testbed/testbed_api.h
+++ b/src/testbed/testbed_api.h
@@ -86,7 +86,6 @@ enum OperationType
    * Get slave config operation
    */
   OP_GET_SLAVE_CONFIG
-
 };
 
 
@@ -178,30 +177,6 @@ struct OperationContext
 };
 
 
-/**
- * Opaque handle for SD calculations
- */
-struct SDHandle;
-
-
-/**
- * A slot to record time taken by an overlay connect operation
- */
-struct TimeSlot
-{
-  /**
-   * A key to identify this timeslot
-   */
-  void *key;
-    
-  /**
-   * Time
-   */
-  struct GNUNET_TIME_Relative time;
-  
-};
-
-
 /**
  * Handle to interact with a GNUnet testbed controller.  Each
  * controller has at least one master handle which is created when the
@@ -294,28 +269,11 @@ struct GNUNET_TESTBED_Controller
    */
   struct OperationQueue *opq_parallel_topology_config_operations;
 
-  /**
-   * Operation queue for simultaneous overlay connect operations
-   */
-  struct OperationQueue *opq_parallel_overlay_connect_operations;
-
-  /**
-   * An array of timing slots; size should be equal to the current number of parallel
-   * overlay connects 
-   */
-  struct TimeSlot *tslots;
-
-  /**
-   * Handle for SD calculations amount parallel overlay connect operation finish
-   * times
-   */
-  struct SDHandle *poc_sd;
-
   /**
    * The controller event mask
    */
   uint64_t event_mask;
-  
+
   /**
    * Did we start the receive loop yet?
    */
@@ -326,16 +284,6 @@ struct GNUNET_TESTBED_Controller
    */
   int aux_host;
 
-  /**
-   * The number of parallel overlay connects we do currently
-   */
-  unsigned int num_parallel_connects;
-
-  /**
-   * Counter to indicate when all the available time slots are filled
-   */
-  unsigned int tslots_filled;
-
   /**
    * The operation id counter. use current value and increment
    */
@@ -392,8 +340,7 @@ GNUNET_TESTBED_operation_add_ (struct GNUNET_TESTBED_Operation *op);
  * @return the initialization message
  */
 struct GNUNET_TESTBED_HelperInit *
-GNUNET_TESTBED_create_helper_init_msg_ (const char *cname,
-                                       const char *hostname,
+GNUNET_TESTBED_create_helper_init_msg_ (const char *cname, const char *hostname,
                                         const struct GNUNET_CONFIGURATION_Handle
                                         *cfg);
 
@@ -506,9 +453,9 @@ struct GNUNET_TESTBED_Operation *
 GNUNET_TESTBED_controller_link_2_ (void *op_cls,
                                    struct GNUNET_TESTBED_Controller *master,
                                    uint32_t delegated_host_id,
-                                   uint32_t slave_host_id,
-                                   const char *sxcfg, size_t sxcfg_size,
-                                   size_t scfg_size, int is_subordinate);
+                                   uint32_t slave_host_id, const char *sxcfg,
+                                   size_t sxcfg_size, size_t scfg_size,
+                                   int is_subordinate);
 
 
 /**
@@ -532,56 +479,11 @@ GNUNET_TESTBED_controller_link_2_ (void *op_cls,
  */
 struct GNUNET_TESTBED_Operation *
 GNUNET_TESTBED_controller_link_ (void *op_cls,
-                               struct GNUNET_TESTBED_Controller *master,
-                                uint32_t delegated_host_id,
-                                uint32_t slave_host_id,
-                                const struct GNUNET_CONFIGURATION_Handle
-                                *slave_cfg,
-                                 int is_subordinate);
-
-
-/**
- * Returns a timing slot which will be exclusively locked
- *
- * @param c the controller handle
- * @param key a pointer which is associated to the returned slot; should not be
- *          NULL. It serves as a key to determine the correct owner of the slot
- * @return the time slot index in the array of time slots in the controller
- *           handle
- */
-unsigned int
-GNUNET_TESTBED_get_tslot_ (struct GNUNET_TESTBED_Controller *c, void *key);
-
-
-/**
- * Function to update a time slot
- *
- * @param c the controller handle
- * @param index the index of the time slot to update
- * @param key the key to identify ownership of the slot
- * @param time the new time
- */
-void
-GNUNET_TESTBED_update_time_slot_ (struct GNUNET_TESTBED_Controller *c,
-                                  unsigned int index,
-                                  void *key,
-                                  struct GNUNET_TIME_Relative time);
-
-
-/**
- * Releases a time slot thus making it available for be used again
- *
- * @param c the controller handle
- * @param index the index of the the time slot
- * @param key the key to prove ownership of the timeslot
- * @return GNUNET_YES if the time slot is successfully removed; GNUNET_NO if the
- *           time slot cannot be removed - this could be because of the index
- *           greater than existing number of time slots or `key' being different
- */
-int
-GNUNET_TESTBED_release_time_slot_ (struct GNUNET_TESTBED_Controller *c,
-                                  unsigned int index,
-                                   void *key);
+                                 struct GNUNET_TESTBED_Controller *master,
+                                 uint32_t delegated_host_id,
+                                 uint32_t slave_host_id,
+                                 const struct GNUNET_CONFIGURATION_Handle
+                                 *slave_cfg, int is_subordinate);