Change the way we specify the sizes of bandwidth tests to be able to send really...

[simgrid.git] / src / amok / Bandwidth / bandwidth_private.h

diff --git a/src/amok/Bandwidth/bandwidth_private.h b/src/amok/Bandwidth/bandwidth_private.h
index 0fa86f0..21f39bb 100644 (file)
--- a/src/amok/Bandwidth/bandwidth_private.h
+++ b/src/amok/Bandwidth/bandwidth_private.h
@@ -16,27 +16,28 @@
 #include "gras.h"
 #include "amok/bandwidth.h"
 
-void amok_bw_bw_init(void); /* Must be called only once per node */
-void amok_bw_bw_join(void); /* Each process must run it */
-void amok_bw_bw_leave(void);/* Each process must run it */
+XBT_PUBLIC void amok_bw_bw_init(void); /* Must be called only once per node */
+XBT_PUBLIC void amok_bw_bw_join(void); /* Each process must run it */
+XBT_PUBLIC void amok_bw_bw_leave(void);/* Each process must run it */
 
-void amok_bw_sat_init(void); /* Must be called only once per node */
-void amok_bw_sat_join(void); /* Each process must run it */
-void amok_bw_sat_leave(void);/* Each process must run it */
+XBT_PUBLIC void amok_bw_sat_init(void); /* Must be called only once per node */
+XBT_PUBLIC void amok_bw_sat_join(void); /* Each process must run it */
+XBT_PUBLIC void amok_bw_sat_leave(void);/* Each process must run it */
 
 /***
  * Plain bandwidth measurement stuff
  ***/
 
 /* Request for a BW experiment.
- * If host==NULL, it should be between the sender and the receiver.
- * If not, it should be between between the receiver and host (3-tiers).
+ * If peer==NULL, it should be between the sender and the receiver.
+ * If not, it should be between between the receiver and peer (3-tiers).
  */
 typedef struct {
-  s_xbt_host_t host; /* host+raw socket to use */
+  s_xbt_peer_t peer; /* peer+raw socket to use */
   unsigned long int buf_size;
-  unsigned long int exp_size;
   unsigned long int msg_size;
+  unsigned long int msg_amount;
+  double min_duration;
 } s_bw_request_t,*bw_request_t;
 
 /* Result of a BW experiment (payload when answering). */
@@ -51,15 +52,15 @@ typedef struct {
  * Saturation stuff
  ***/
 
-/* Description of a saturation experiment (payload asking some host to collaborate for that)
+/* Description of a saturation experiment (payload asking some peer to collaborate for that)
  */
 typedef struct {
-  s_xbt_host_t host; /* host+raw socket to use */
+  s_xbt_peer_t peer; /* peer+raw socket to use */
   unsigned int msg_size;
   unsigned int duration;
 } s_sat_request_t,*sat_request_t;
 
-void amok_bw_sat_start(const char* from_name,unsigned int from_port,
+XBT_PUBLIC void amok_bw_sat_start(const char* from_name,unsigned int from_port,
                       const char* to_name,unsigned int to_port,
                       unsigned int msg_size, unsigned int duration);