gras_msgtype_declare_rpc("BW request", bw_request_desc,bw_res_desc);
}
void amok_bw_bw_join() {
- gras_cb_register(gras_msgtype_by_name("BW request"),
- &amok_bw_cb_bw_request);
- gras_cb_register(gras_msgtype_by_name("BW handshake"),
- &amok_bw_cb_bw_handshake);
+ gras_cb_register("BW request", &amok_bw_cb_bw_request);
+ gras_cb_register("BW handshake",&amok_bw_cb_bw_handshake);
}
void amok_bw_bw_leave() {
- gras_cb_unregister(gras_msgtype_by_name("BW request"),
- &amok_bw_cb_bw_request);
- gras_cb_unregister(gras_msgtype_by_name("BW handshake"),
- &amok_bw_cb_bw_handshake);
+ gras_cb_unregister("BW request", &amok_bw_cb_bw_request);
+ gras_cb_unregister("BW handshake",&amok_bw_cb_bw_handshake);
}
/**
request->msg_amount=msg_amount;
request->peer.name = NULL;
request->peer.port = gras_socket_my_port(measMasterIn);
- DEBUG5("Handshaking with %s:%d to connect it back on my %d (bufsize=%ld byte= %ld b)",
+ DEBUG6("Handshaking with %s:%d to connect it back on my %d (bufsize=%ld, msg_size=%ld, msg_amount=%ld)",
gras_socket_peer_name(peer),gras_socket_peer_port(peer), request->peer.port,
- buf_size,request->buf_size);
+ request->buf_size,request->msg_size,request->msg_amount);
TRY {
- gras_msg_rpccall(peer,15,
- gras_msgtype_by_name("BW handshake"),&request, &request_ack);
+ gras_msg_rpccall(peer,15,"BW handshake",&request, &request_ack);
} CATCH(e) {
RETHROW0("Error encountered while sending the BW request: %s");
}
request->msg_size, request->msg_amount,
((double)request->msg_size) * ((double)request->msg_amount / (*sec) /1024.0/1024.0));
- gras_msg_rpccall(peer, 60, gras_msgtype_by_name("BW reask"),&request, NULL);
+ gras_msg_rpccall(peer, 60, "BW reask",&request, NULL);
}
first_pass = 0;
DEBUG2("This measurement was long enough (%f sec; found %f b/s). Stop peer",
*sec,*bw);
- gras_msg_send(peer, gras_msgtype_by_name("BW stop"), NULL);
+ gras_msg_send(peer, "BW stop", NULL);
free(request_ack);
free(request);
free(answer);
free(request);
VERB0("BW experiment done.");
- return 1;
+ return 0;
}
/**
DEBUG4("Ask for a BW test between %s:%d and %s:%d", from_name,from_port, to_name,to_port);
- gras_msg_rpccall(sock,20*60,gras_msgtype_by_name("BW request"), &request, &result);
+ gras_msg_rpccall(sock,20*60,"BW request", &request, &result);
if (sec)
*sec=result->sec;
gras_socket_t peer,asker;
asker=gras_msg_cb_ctx_from(ctx);
- VERB4("Asked by %s:%d to conduct a bw XP with %s:%d",
+ VERB6("Asked by %s:%d to conduct a bw XP with %s:%d (request: %ld %ld)",
gras_socket_peer_name(asker),gras_socket_peer_port(asker),
- request->peer.name,request->peer.port);
+ request->peer.name,request->peer.port,
+ request->msg_size,request->msg_amount);
peer = gras_socket_client(request->peer.name,request->peer.port);
amok_bw_test(peer,
request->buf_size,request->msg_size,request->msg_amount,
free(request);
free(result);
- return 1;
+ return 0;
}
/** \brief builds a matrix of results of bandwidth measurement
/* construction of matrices for bandwith and latency */
- int i,j,len=xbt_dynar_length(peers);
+ unsigned int i,j;
+ int len=xbt_dynar_length(peers);
double *matrix_res = xbt_new0(double, len*len);
xbt_peer_t p1,p2;