- verboser log, faster start

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

diff --git a/src/testbed/testbed_api_peers.h b/src/testbed/testbed_api_peers.h
index 4996f1012b200967734852e767dcced1b77114f2..8598cc177a8e068b940f4ac9810eb86d6b394210 100644 (file)
--- a/src/testbed/testbed_api_peers.h
+++ b/src/testbed/testbed_api_peers.h
@@ -121,6 +121,29 @@ struct PeerCreateData
 };
 
 
+/**
+ * Data for OperationType OP_PEER_START and OP_PEER_STOP
+ */
+struct PeerEventData
+{
+  /**
+   * The handle of the peer to start
+   */
+  struct GNUNET_TESTBED_Peer *peer;
+
+  /**
+   * The Peer churn callback to call when this operation is completed
+   */
+  GNUNET_TESTBED_PeerChurnCallback pcc;
+
+  /**
+   * Closure for the above callback
+   */
+  void *pcc_cls;
+
+};
+
+
 /**
  * Data for the OperationType OP_PEER_DESTROY;
  */
@@ -149,7 +172,7 @@ struct PeerInfoData
    * The Peer info callback to call when this operation has completed
    */
   GNUNET_TESTBED_PeerInfoCallback cb;
-    
+
   /**
    * The closure for peer info callback
    */
@@ -167,6 +190,7 @@ struct PeerInfoData
  */
 struct OverlayConnectData
 {
+
   /**
    * Peer A to connect to peer B
    */
@@ -181,55 +205,35 @@ struct OverlayConnectData
    * The operation completion callback to call once this operation is done
    */
   GNUNET_TESTBED_OperationCompletionCallback cb;
-  
+
   /**
    * The closure for the above callback
    */
   void *cb_cls;
 
-};
+  /**
+   * OperationContext for forwarded operations generated when peer1's controller doesn't have the
+   * configuration of peer2's controller for linking laterally to attemp an
+   * overlay connection between peer 1 and peer 2.
+   */
+  struct OperationContext *sub_opc;
 
+  /**
+   * The starting time of this operation
+   */
+  struct GNUNET_TIME_Absolute tstart;
 
+  /**
+   * Has this operation failed
+   */
+  int failed;
 
-/**
- * Create the given peer at the specified host using the given
- * controller.  If the given controller is not running on the target
- * host, it should find or create a controller at the target host and
- * delegate creating the peer.  Explicit delegation paths can be setup
- * using 'GNUNET_TESTBED_controller_link'.  If no explicit delegation
- * path exists, a direct link with a subordinate controller is setup
- * for the first delegated peer to a particular host; the subordinate
- * controller is then destroyed once the last peer that was delegated
- * to the remote host is stopped.  This function is used in particular
- * if some other controller has already assigned a unique ID to the
- * peer.
- *
- * Creating the peer only creates the handle to manipulate and further
- * configure the peer; use "GNUNET_TESTBED_peer_start" and
- * "GNUNET_TESTBED_peer_stop" to actually start/stop the peer's
- * processes.
- *
- * Note that the given configuration will be adjusted by the
- * controller to avoid port/path conflicts with other peers.
- * The "final" configuration can be obtained using
- * 'GNUNET_TESTBED_peer_get_information'.
- *
- * @param unique_id unique ID for this peer
- * @param controller controller process to use
- * @param host host to run the peer on
- * @param cfg configuration to use for the peer
- * @param cb the callback to call when the peer has been created
- * @param cls the closure to the above callback
- * @return the operation handle
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_create_with_id_ (uint32_t unique_id,
-                                     struct GNUNET_TESTBED_Controller
-                                     *controller,
-                                     struct GNUNET_TESTBED_Host *host,
-                                     const struct GNUNET_CONFIGURATION_Handle
-                                     *cfg, GNUNET_TESTBED_PeerCreateCallback cb,
-                                     void *cls);
+  /**
+   * The timing slot index for this operation
+   */
+  unsigned int tslot_index;
+
+};
 
 
 /**