free this dynar in none_finalize (if it was used).

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

diff --git a/include/amok/bandwidth.h b/include/amok/bandwidth.h
index d5d6a77..6f5ff0b 100644 (file)
--- a/include/amok/bandwidth.h
+++ b/include/amok/bandwidth.h
@@ -1,8 +1,7 @@
-/* $Id$ */
-
 /* amok_bandwidth - Bandwidth test facilities                               */
 
-/* Copyright (c) 2003-2005 Martin Quinson. All rights reserved.             */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -10,8 +9,6 @@
 #ifndef AMOK_BANDWIDTH_H
 #define AMOK_BANDWIDTH_H
 
-#include "amok/base.h"
-   
 /** \addtogroup AMOK_bw
  *  \brief Test the bandwidth between two nodes
  *
@@ -34,7 +31,7 @@
  *  when the sender and receiver processor architecture are different,
  *  inducing extra delays. For this, GRAS provide the so-called measurement
  *  sockets. On them, you can send raw data which is not converted (see
- *  \ref GRAS_sock_meas). 
+ *  \ref XBT_sock_meas). 
  *
  *  Solving all these problems is quite error prone and anoying, so we
  *  implemented this in the current module so that you don't have to do it
@@ -91,37 +88,53 @@
 
 /* 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,
-         /*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);
-
-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(xbt_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*/ double *time, double *bw);
+XBT_PUBLIC(void) amok_bw_saturate_stop(const char *from_name,
+                                       unsigned int from_port,
+                                       /*out */ double *time, double *bw);
 
 /** @} */
 
-#endif /* AMOK_BANDWIDTH_H */
+#endif                          /* AMOK_BANDWIDTH_H */