cleanup the GRAS+AMOK initialization schema

[simgrid.git] / include / amok / bandwidth.h

diff --git a/include/amok/bandwidth.h b/include/amok/bandwidth.h
index 00b1b9c..0976f95 100644 (file)
--- 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,20 +87,24 @@
  *  @{
  */
 
+/* module handling */
+
 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,
+                 double min_duration,
          /*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,
+                    double min_duration,
             /*OUT*/ double *sec, double*bw);
 
 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);
+                        int buf_size_bw, int exp_size_bw, int msg_size_bw, double min_duration);
 
 /* ***************************************************************************
  * Link saturation