X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7982e65ff47636c6e00c37fcc17964bcd6ac6323..dff9e15c44ab6340d27215957c56fa72fad246a2:/include/amok/bandwidth.h

diff --git a/include/amok/bandwidth.h b/include/amok/bandwidth.h
index 280431a3e2..295afbdd8a 100644
--- a/include/amok/bandwidth.h
+++ b/include/amok/bandwidth.h
@@ -10,11 +10,6 @@
 #ifndef AMOK_BANDWIDTH_H
 #define AMOK_BANDWIDTH_H
 
-#include "amok/base.h"
-
-/* module handling */
-
-   
 /** \addtogroup AMOK_bw
  *  \brief Test the bandwidth between two nodes
  *
@@ -92,36 +87,52 @@
  *  @{
  */
 
-void amok_bw_init(void);
-void amok_bw_exit(void);
-
-void amok_bw_test(gras_socket_t peer,
-		  unsigned long int buf_size,unsigned long int exp_size,unsigned long int msg_size,
-	  /*OUT*/ double *sec, double *bw);
-
-void amok_bw_request(const char* from_name,unsigned int from_port,
-		     const char* to_name,unsigned int to_port,
-		     unsigned long int buf_size,unsigned long int exp_size,unsigned long int msg_size,
-	     /*OUT*/ double *sec, double*bw);
+/* module handling */
 
-double * amok_bw_matrix(xbt_dynar_t hosts, /* dynar of xbt_host_t */
-                        int buf_size_bw, int exp_size_bw, int msg_size_bw);
+XBT_PUBLIC(void) amok_bw_init(void);
+XBT_PUBLIC(void) amok_bw_exit(void);
+
+XBT_PUBLIC(void) amok_bw_test(gras_socket_t peer,
+                              unsigned long int buf_size,
+                              unsigned long int msg_size,
+                              unsigned long int msg_amount,
+                              double min_duration,
+                              /*OUT*/ double *sec, double *bw);
+
+XBT_PUBLIC(void) amok_bw_request(const char *from_name,
+                                 unsigned int from_port, const char *to_name,
+                                 unsigned int to_port,
+                                 unsigned long int buf_size,
+                                 unsigned long int msg_size,
+                                 unsigned long int msg_amount,
+                                 double min_duration, /*OUT*/ double *sec,
+                                 double *bw);
+
+XBT_PUBLIC(double *) amok_bw_matrix(xbt_dynar_t hosts,  /* dynar of xbt_host_t */
+                                    int buf_size_bw, int msg_size_bw,
+                                    int msg_amount_bw, double min_duration);
 
 /* ***************************************************************************
  * Link saturation
  * ***************************************************************************/
 
 
-void amok_bw_saturate_start(const char* from_name,unsigned int from_port,
-			    const char* to_name,unsigned int to_port,
-			    unsigned int msg_size, double duration);
+XBT_PUBLIC(void) amok_bw_saturate_start(const char *from_name,
+                                        unsigned int from_port,
+                                        const char *to_name,
+                                        unsigned int to_port,
+                                        unsigned int msg_size,
+                                        double duration);
 
-void amok_bw_saturate_begin(const char* to_name,unsigned int to_port,
-			    unsigned int msg_size, double duration,
-			    /*out*/ double *elapsed, double *bw);
+XBT_PUBLIC(void) amok_bw_saturate_begin(const char *to_name,
+                                        unsigned int to_port,
+                                        unsigned int msg_size,
+                                        double duration,
+                                        /*out */ double *elapsed, double *bw);
 
-void amok_bw_saturate_stop(const char* from_name,unsigned int from_port,
-			   /*out*/ unsigned int *time, unsigned int *bw);
+XBT_PUBLIC(void) amok_bw_saturate_stop(const char *from_name,
+                                       unsigned int from_port,
+                                       /*out */ double *time, double *bw);
 
 /** @} */