#include "amok/Bandwidth/bandwidth_private.h"
#include "gras/Msg/msg_private.h" /* FIXME: This mucks with contextes to answer RPC directly */
+#include "xbt/ex.h"
-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);
/* Build the saturation datatype descriptions */
sat_request_desc = gras_datadesc_struct("s_sat_request_desc_t");
- gras_datadesc_struct_append(sat_request_desc,"host",gras_datadesc_by_name("s_xbt_host_t"));
+ gras_datadesc_struct_append(sat_request_desc,"peer",gras_datadesc_by_name("s_xbt_peer_t"));
gras_datadesc_struct_append(sat_request_desc,"msg_size",gras_datadesc_by_name("unsigned int"));
gras_datadesc_struct_append(sat_request_desc,"duration",gras_datadesc_by_name("unsigned int"));
gras_datadesc_struct_close(sat_request_desc);
/**
* @brief Ask 'from_name:from_port' to stop saturating going to to_name:to_name.
*
- * @param from_name: Name of the host we are asking to do a experiment with (to_name:to_port)
+ * @param from_name: Name of the peer we are asking to do a experiment with (to_name:to_port)
* @param from_port: port on which the process we are asking for an experiment is listening
* (for message, do not give a raw socket here. The needed raw socket will be negociated
* between the peers)
- * @param to_name: Name of the host with which we should conduct the experiment
+ * @param to_name: Name of the peer with which we should conduct the experiment
* @param to_port: port on which the peer process is listening for message
* @param msg_size: Size of each message sent.
* @param duration: How long in maximum should be the saturation.
const char* to_name,unsigned int to_port,
unsigned int msg_size, double duration) {
gras_socket_t sock;
-
+ xbt_ex_t e;
sat_request_t request = xbt_new(s_sat_request_t,1);
+ INFO2("from_name %s // to_name %s \n",from_name,to_name);
sock = gras_socket_client(from_name,from_port);
- request->host.name = (char*)to_name;
- request->host.port = to_port;
+ request->peer.name = (char*)to_name;
+ request->peer.port = to_port;
request->duration=duration;
request->msg_size=msg_size;
-
+ TRY{
gras_msg_rpccall(sock,60,gras_msgtype_by_name("amok_bw_sat start"),&request, NULL);
+ }CATCH(e){
+ if (e.value==1)
+ THROW1(0,1,"%s",to_name);
+ THROW1(0,0,"%s",from_name);
+ }
free(request);
gras_socket_close(sock);
}
static int amok_bw_cb_sat_start(gras_msg_cb_ctx_t ctx, void *payload){
sat_request_t request = *(sat_request_t*)payload;
gras_socket_t expeditor = gras_msg_cb_ctx_from(ctx);
+
+ xbt_ex_t e;
VERB4("Asked by %s:%d to start a saturation to %s:%d",
gras_socket_peer_name(expeditor),gras_socket_peer_port(expeditor),
- request->host.name,request->host.port);
+ request->peer.name,request->peer.port);
gras_msg_rpcreturn(60,ctx, NULL);
- amok_bw_saturate_begin(request->host.name,request->host.port,
+
+TRY{
+ amok_bw_saturate_begin(request->peer.name,request->peer.port,
+
request->msg_size, request->duration,
NULL,NULL);
- free(request->host.name);
+
+ }CATCH(e){
+ THROW1(0,1," can not connect %s ",((request)->peer.name));
+ }
+
+ free(request->peer.name);
+
free(request);
return 1;
}
* @brief Start saturating between the current process and the designated peer
*
* Note that the only way to break this function before the end of the timeout
- * is to have a remote host calling amok_bw_saturate_stop to this process.
+ * is to have a remote peer calling amok_bw_saturate_stop to this process.
*
* If duration=0, the experiment will never timeout (you then have to manually
- * stop it)
+ * stop it).
+ *
+ * If msg_size=0, the size will be automatically computed to make sure that
+ * each of the messages occupy the connexion one second
*/
void amok_bw_saturate_begin(const char* to_name,unsigned int to_port,
unsigned int msg_size, double duration,
request->msg_size = msg_size;
request->duration = duration;
- request->host.name = NULL;
- request->host.port = 0;
+ request->peer.name = NULL;
+ request->peer.port = 0;
+
+
+ /* Size autodetection on need */
+ if (!msg_size) {
+ double bw;
+ double sec;
+ amok_bw_test(peer_cmd,
+ 0,512*1024, 512*1024, /* 512k as first guess */
+ 1, /* at least one sec */
+ &sec, &bw);
+ msg_size = request->msg_size = (int)bw;
+ DEBUG1("Saturate with packets of %d bytes",request->msg_size);
+ }
+
+ /* Launch the saturation */
ctx = gras_msg_rpc_async_call(peer_cmd, 60,
gras_msgtype_by_name("amok_bw_sat begin"),
&request);
free(request);
gras_msg_rpc_async_wait(ctx,&request);
- meas=gras_socket_client_ext( to_name, request->host.port,
+ meas=gras_socket_client_ext( to_name, request->peer.port,
0 /*bufsize: auto*/,
1 /*meas: true*/);
+
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();
/* Check whether the experiment has to be terminated by now */
elapsed=gras_os_time()-start;
- VERB2("elapsed %f duration %f",elapsed, duration);
+ DEBUG3("elapsed %f duration %f (msg_size=%d)",elapsed, duration,msg_size);
- } while (duration==0 || saturate_further && elapsed < duration);
+ } while (saturate_further && (duration==0 || elapsed < duration));
bw = ((double)(packet_sent*msg_size)) / elapsed;
gras_msg_rpcreturn(60,&ctx,&answer);
free(answer);
} else {
- INFO3("Saturation from %s to %s elapsed after %f sec (achieving %f kb/s)",
+ INFO4("Saturation from %s to %s elapsed after %f sec (achieving %f kb/s)",
gras_os_myname(),to_name,elapsed,bw/1024.0);
}
volatile int saturate_further = 1;
xbt_ex_t e;
gras_socket_t measMaster=NULL,meas=NULL;
+ gras_socket_t from=gras_msg_cb_ctx_from(ctx);
int port=6000;
while (port <= 10000 && measMaster == NULL) {
if (measMaster == NULL)
port++; /* prepare for a new loop */
}
- answer->host.port=port;
+ answer->peer.port=port;
gras_msg_rpcreturn(60, ctx, &answer);
free(answer);
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);
}
}
- INFO1("Saturation stopped on %s",gras_os_myname());
+ INFO3("Saturation comming from %s:%d stopped on %s",
+ gras_socket_peer_name(from),gras_socket_peer_port(from),
+ gras_os_myname());
+
gras_socket_close(meas);
if (gras_if_RL()) /* On SG, accepted=master */
gras_socket_close(measMaster);
/**
* @brief Ask 'from_name:from_port' to stop any saturation experiments
- * @param from_name: Name of the host we are asking to do a experiment with (to_name:to_port)
+ * @param from_name: Name of the peer we are asking to do a experiment with (to_name:to_port)
* @param from_port: port on which the process we are asking for an experiment is listening
* @param time: the duration of the experiment
* @param bw: the achieved bandwidth
*/
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;
- 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;
+ free(answer);
}
