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
Propagate the change the API of GRAS measurement sockets into the saturation code.
[simgrid.git]
/
src
/
amok
/
Bandwidth
/
saturate.c
diff --git
a/src/amok/Bandwidth/saturate.c
b/src/amok/Bandwidth/saturate.c
index
5924a2f
..
c504ab0
100644
(file)
--- a/
src/amok/Bandwidth/saturate.c
+++ b/
src/amok/Bandwidth/saturate.c
@@
-73,7
+73,8
@@
void amok_bw_saturate_start(const char* from_name,unsigned int from_port,
gras_socket_t sock;
sat_request_t request = xbt_new(s_sat_request_t,1);
gras_socket_t sock;
sat_request_t request = xbt_new(s_sat_request_t,1);
- INFO4("Start from_name %s:%d -> to_name %s:%d",from_name,from_port,to_name,to_port);
+ VERB4("Start from_name %s:%d -> to_name %s:%d",
+ from_name, from_port, to_name, to_port);
sock = gras_socket_client(from_name,from_port);
request->peer.name = (char*)to_name;
sock = gras_socket_client(from_name,from_port);
request->peer.name = (char*)to_name;
@@
-186,7
+187,7
@@
void amok_bw_saturate_begin(const char* to_name,unsigned int to_port,
do {
/* do send it */
do {
/* do send it */
- gras_socket_meas_send(meas,
120,msg_size,msg_size
);
+ gras_socket_meas_send(meas,
120, msg_size, 1
);
packet_sent++;
/* Check whether someone asked us to stop saturation */
packet_sent++;
/* Check whether someone asked us to stop saturation */
@@
-284,7
+285,7
@@
static int amok_bw_cb_sat_begin(gras_msg_cb_ctx_t ctx, void *payload){
while (saturate_further) {
TRY {
while (saturate_further) {
TRY {
- gras_socket_meas_recv(meas,
5,request->msg_size,request->msg_size
);
+ gras_socket_meas_recv(meas,
5, request->msg_size, 1
);
} CATCH(e) {
saturate_further = 0;
xbt_ex_free(e);
} CATCH(e) {
saturate_further = 0;
xbt_ex_free(e);