gras_socket_t sock;
sat_request_t request = xbt_new(s_sat_request_t, 1);
- VERB4("Start from_name %s:%d -> to_name %s:%d",
+ XBT_VERB("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);
sat_request_t request = *(sat_request_t *) payload;
gras_socket_t expeditor = gras_msg_cb_ctx_from(ctx);
- VERB4("Asked by %s:%d to start a saturation to %s:%d",
+ XBT_VERB("Asked by %s:%d to start a saturation to %s:%d",
gras_socket_peer_name(expeditor), gras_socket_peer_port(expeditor),
request->peer.name, request->peer.port);
/* Negociate the saturation with the peer */
sat_request_t request = xbt_new(s_sat_request_t, 1);
- DEBUG2("Begin to saturate to %s:%d", to_name, to_port);
+ XBT_DEBUG("Begin to saturate to %s:%d", to_name, to_port);
memset(&msg_got, 0, sizeof(msg_got));
request->msg_size = msg_size;
1, /* at least one sec */
&sec, &bw);
msg_size = request->msg_size = (int) bw;
- DEBUG1("Saturate with packets of %d bytes", request->msg_size);
+ XBT_DEBUG("Saturate with packets of %d bytes", request->msg_size);
}
/* Launch the saturation */
free(request);
gras_socket_close(peer_cmd);
- INFO4("Saturation(%s:%d->%s:%d) started", gras_os_myname(),
+ XBT_INFO("Saturation(%s:%d->%s:%d) started", gras_os_myname(),
gras_os_myport(), to_name, to_port);
/* Start experiment */
/* Check whether the experiment has to be terminated by now */
elapsed = gras_os_time() - start;
- DEBUG3("elapsed %f duration %f (msg_size=%d)", elapsed, duration,
+ XBT_DEBUG("elapsed %f duration %f (msg_size=%d)", elapsed, duration,
msg_size);
} while (saturate_further && (duration == 0 || elapsed < duration));
bw_res_t answer = xbt_new(s_bw_res_t, 1);
s_gras_msg_cb_ctx_t ctx;
- INFO6("Saturation from %s:%d to %s:%d stopped by %s:%d",
+ XBT_INFO("Saturation from %s:%d to %s:%d stopped by %s:%d",
gras_os_myname(), gras_os_myport(), to_name, to_port,
gras_socket_peer_name(msg_got.expe),
gras_socket_peer_port(msg_got.expe));
gras_msg_rpcreturn(60, &ctx, &answer);
free(answer);
} else {
- INFO6
+ XBT_INFO
("Saturation from %s:%d to %s:%d elapsed after %f sec (achieving %f kb/s)",
gras_os_myname(), gras_os_myport(), to_name, to_port, elapsed,
bw / 1024.0);
if (port < 10000)
xbt_ex_free(e);
else
- RETHROW0
+ RETHROWF
("Error encountered while opening a measurement server socket: %s");
}
if (measMaster == NULL)
TRY {
meas = gras_socket_meas_accept(measMaster);
- DEBUG0("saturation handshake answered");
+ XBT_DEBUG("saturation handshake answered");
}
CATCH(e) {
gras_socket_close(measMaster);
- RETHROW0("Error during saturation handshake: %s");
+ RETHROWF("Error during saturation handshake: %s");
}
while (saturate_further) {
xbt_ex_free(e);
}
}
- INFO4("Saturation comming from %s:%d stopped on %s:%d",
+ XBT_INFO("Saturation comming from %s:%d stopped on %s:%d",
gras_socket_peer_name(from), gras_socket_peer_port(from),
gras_os_myname(), gras_os_myport());
gras_socket_t sock = gras_socket_client(from_name, from_port);
bw_res_t answer;
- VERB2("Ask %s:%d to stop the saturation", from_name, from_port);
+ XBT_VERB("Ask %s:%d to stop the saturation", from_name, from_port);
TRY {
gras_msg_rpccall(sock, 60, "amok_bw_sat stop", NULL, &answer);
} CATCH(e) {
- RETHROW2("Cannot ask %s:%d to stop saturation: %s", from_name,
+ RETHROWF("Cannot ask %s:%d to stop saturation: %s", from_name,
from_port);
}
gras_socket_close(sock);