#include "amok/Bandwidth/bandwidth_private.h"
#include "gras/Msg/msg_private.h" /* FIXME: This mucks with contextes to answer RPC directly */
-XBT_LOG_EXTERNAL_CATEGORY(amok_bw);
-XBT_LOG_DEFAULT_CATEGORY(amok_bw);
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(amok_bw_sat,amok_bw,"Everything concerning the SATuration part of the amok_bw module");
static int amok_bw_cb_sat_start(gras_msg_cb_ctx_t ctx, void *payload);
static int amok_bw_cb_sat_begin(gras_msg_cb_ctx_t ctx, void *payload);
free(request);
gras_socket_close(peer_cmd);
- INFO2("Saturation from %s to %s started",gras_os_myname(),to_name);
+ INFO2("Saturation(%s->%s) started",gras_os_myname(),to_name);
/* Start experiment */
start=gras_os_time();
while (saturate_further) {
TRY {
- gras_socket_meas_recv(meas,120,request->msg_size,request->msg_size);
+ gras_socket_meas_recv(meas,5,request->msg_size,request->msg_size);
} CATCH(e) {
saturate_further = 0;
xbt_ex_free(e);
*/
void amok_bw_saturate_stop(const char* from_name,unsigned int from_port,
/*out*/ double *time, double *bw) {
-
+ xbt_ex_t e;
+
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);
- gras_msg_rpccall(sock,60,gras_msgtype_by_name("amok_bw_sat stop"),NULL,&answer);
+ VERB2("Ask %s:%d to stop the saturation",from_name,from_port);
+ TRY {
+ gras_msg_rpccall(sock,60,gras_msgtype_by_name("amok_bw_sat stop"),NULL,&answer);
+ } CATCH(e) {
+ RETHROW2("Cannot ask %s:%d to stop saturation: %s",from_name, from_port);
+ }
gras_socket_close(sock);
if (time) *time=answer->sec;
if (bw) *bw =answer->bw;
ctx->msgtype=msgtype;
ctx->timeout=timeOut;
- VERB5("Send to %s:%d a RPC of type '%s' (ID=%lu) (exception%s caught)",
+ VERB4("Send to %s:%d a RPC of type '%s' (ID=%lu)",
gras_socket_peer_name(server),
gras_socket_peer_port(server),
- msgtype->name,ctx->ID,
- (__xbt_ex_ctx()->ctx_caught?"":" not"));
+ msgtype->name,ctx->ID);
gras_msg_send_ext(server, e_gras_msg_kind_rpccall, ctx->ID, msgtype, request);
*/
void gras_msg_rpcreturn(double timeOut,gras_msg_cb_ctx_t ctx,void *answer) {
- DEBUG3("Return to RPC %s (tOut=%f, payl=%p)",
- ctx->msgtype->name,timeOut,answer);
+ DEBUG5("Return to RPC '%s' from %s:%d (tOut=%f, payl=%p)",
+ ctx->msgtype->name,
+ gras_socket_peer_name(ctx->expeditor),gras_socket_peer_port(ctx->expeditor),
+ timeOut,answer);
gras_msg_send_ext(ctx->expeditor, e_gras_msg_kind_rpcanswer,
ctx->ID, ctx->msgtype, answer);
}