A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change the way we specify the sizes of bandwidth tests to be able to send really...
[simgrid.git]
/
include
/
amok
/
bandwidth.h
diff --git
a/include/amok/bandwidth.h
b/include/amok/bandwidth.h
index
280431a
..
25d83b1
100644
(file)
--- a/
include/amok/bandwidth.h
+++ b/
include/amok/bandwidth.h
@@
-10,11
+10,6
@@
#ifndef AMOK_BANDWIDTH_H
#define AMOK_BANDWIDTH_H
#ifndef AMOK_BANDWIDTH_H
#define AMOK_BANDWIDTH_H
-#include "amok/base.h"
-
-/* module handling */
-
-
/** \addtogroup AMOK_bw
* \brief Test the bandwidth between two nodes
*
/** \addtogroup AMOK_bw
* \brief Test the bandwidth between two nodes
*
@@
-92,36
+87,40
@@
* @{
*/
* @{
*/
-void amok_bw_init(void);
-void amok_bw_exit(void);
+/* module handling */
+
+XBT_PUBLIC void amok_bw_init(void);
+XBT_PUBLIC void amok_bw_exit(void);
-void amok_bw_test(gras_socket_t peer,
+
XBT_PUBLIC
void amok_bw_test(gras_socket_t peer,
unsigned long int buf_size,unsigned long int exp_size,unsigned long int msg_size,
unsigned long int buf_size,unsigned long int exp_size,unsigned long int msg_size,
+ double min_duration,
/*OUT*/ double *sec, double *bw);
/*OUT*/ double *sec, double *bw);
-void amok_bw_request(const char* from_name,unsigned int from_port,
+
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 exp_size,unsigned long int msg_size,
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);
/*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
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
* ***************************************************************************/
/* ***************************************************************************
* Link saturation
* ***************************************************************************/
-void amok_bw_saturate_start(const char* from_name,unsigned int from_port,
+
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);
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,
+
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);
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);
/** @} */
/** @} */