bw_request_desc = gras_datadesc_ref("bw_request_t",bw_request_desc);
bw_res_desc = gras_datadesc_struct("s_bw_res_t");
- gras_datadesc_struct_append(bw_res_desc,"err",gras_datadesc_by_name("s_amok_remoterr_t"));
gras_datadesc_struct_append(bw_res_desc,"timestamp",gras_datadesc_by_name("unsigned int"));
gras_datadesc_struct_append(bw_res_desc,"seconds",gras_datadesc_by_name("double"));
gras_datadesc_struct_append(bw_res_desc,"bw",gras_datadesc_by_name("double"));
/* Register the saturation messages */
gras_msgtype_declare("SAT start", sat_request_desc);
- gras_msgtype_declare("SAT started", gras_datadesc_by_name("amok_remoterr_t"));
+ gras_msgtype_declare("SAT started", NULL);
gras_msgtype_declare("SAT begin", sat_request_desc);
- gras_msgtype_declare("SAT begun", gras_datadesc_by_name("amok_remoterr_t"));
+ gras_msgtype_declare("SAT begun", NULL);
gras_msgtype_declare("SAT end", NULL);
- gras_msgtype_declare("SAT ended", gras_datadesc_by_name("amok_remoterr_t"));
+ gras_msgtype_declare("SAT ended", NULL);
gras_msgtype_declare("SAT stop", NULL);
- gras_msgtype_declare("SAT stopped", gras_datadesc_by_name("amok_remoterr_t"));
+ gras_msgtype_declare("SAT stopped", NULL);
}
/* Register the callbacks */
*
* Results are reported in last args, and sizes are in kb.
*/
-xbt_error_t amok_bw_test(gras_socket_t peer,
- unsigned long int buf_size,
- unsigned long int exp_size,
- unsigned long int msg_size,
- /*OUT*/ double *sec, double *bw) {
+void amok_bw_test(gras_socket_t peer,
+ unsigned long int buf_size,
+ unsigned long int exp_size,
+ unsigned long int msg_size,
+ /*OUT*/ double *sec, double *bw) {
/* Measurement sockets for the experiments */
- gras_socket_t measMasterIn=NULL,measIn,measOut;
+ gras_socket_t measMasterIn=NULL,measIn,measOut=NULL;
int port;
- xbt_error_t errcode;
bw_request_t request,request_ack;
xbt_ex_t e;
measMasterIn = gras_socket_server_ext(++port,buf_size,1);
} CATCH(e) {
measMasterIn = NULL;
- if (port < 10000) {
- xbt_ex_free(e);
- } else {
+ if (port == 10000 -1) {
RETHROW0("Error caught while opening a measurement socket: %s");
+ } else {
+ xbt_ex_free(e);
}
}
}
request_ack->host.port,
request->buf_size,1);
} CATCH(e) {
- RETHROW2("Error encountered while opening the measurement socket to %s:%d for BW test",
+ RETHROW2("Error encountered while opening the measurement socket to %s:%d for BW test: %s",
gras_socket_peer_name(peer),request_ack->host.port);
}
DEBUG1("Got ACK; conduct the experiment (msg_size=%ld)",request->msg_size);
*sec=gras_os_time();
- gras_socket_meas_send(measOut,120,request->exp_size,request->msg_size);
- gras_socket_meas_recv(measIn,120,1,1);
-
- /*catch
- ERROR1("Error %s encountered while sending the BW experiment.",
- xbt_error_name(errcode));
+ TRY {
+ gras_socket_meas_send(measOut,120,request->exp_size,request->msg_size);
+ gras_socket_meas_recv(measIn,120,1,1);
+ } CATCH(e) {
gras_socket_close(measOut);
gras_socket_close(measMasterIn);
gras_socket_close(measIn);
- */
+ RETHROW0("Unable to conduct the experiment: %s");
+ }
*sec = gras_os_time() - *sec;
*bw = ((double)exp_size) / *sec;
gras_socket_close(measIn);
gras_socket_close(measMasterIn);
gras_socket_close(measOut);
- return errcode;
}
*/
int amok_bw_cb_bw_handshake(gras_socket_t expeditor,
void *payload) {
- gras_socket_t measMasterIn=NULL,measIn,measOut;
+ gras_socket_t measMasterIn=NULL,measIn=NULL,measOut=NULL;
bw_request_t request=*(bw_request_t*)payload;
bw_request_t answer;
xbt_ex_t e;
*
* Results are reported in last args, and sizes are in kb.
*/
-xbt_error_t amok_bw_request(const char* from_name,unsigned int from_port,
- const char* to_name,unsigned int to_port,
- unsigned long int buf_size,
- unsigned long int exp_size,
- unsigned long int msg_size,
- /*OUT*/ double *sec, double*bw) {
+void amok_bw_request(const char* from_name,unsigned int from_port,
+ const char* to_name,unsigned int to_port,
+ unsigned long int buf_size,
+ unsigned long int exp_size,
+ unsigned long int msg_size,
+ /*OUT*/ double *sec, double*bw) {
gras_socket_t sock;
/* The request */
gras_socket_close(sock);
free(result);
- return no_error;
}
int amok_bw_cb_bw_request(gras_socket_t expeditor,
free(result);
return 1;
-
-#if 0
- char* to_name=gras_msg_ctn(msg,0,0,msgHost_t).host;
- unsigned int to_port=gras_msg_ctn(msg,0,0,msgHost_t).port;
-
- unsigned int bufSize=gras_msg_ctn(msg,1,0,BwExp_t).bufSize;
- unsigned int expSize=gras_msg_ctn(msg,1,0,BwExp_t).expSize;
- unsigned int msgSize=gras_msg_ctn(msg,1,0,BwExp_t).msgSize;
- /* our answer */
- msgError_t *error;
- msgResult_t *res;
-
- if ((error->errcode=grasbw_test(to_name,to_port,bufSize,expSize,msgSize,
- &(res[0].value),&(res[1].value) ))) {
- fprintf(stderr,
- "%s:%d:grasbw_cbRequest: Error %s encountered while doing the test\n",
- __FILE__,__LINE__,xbt_error_name(error->errcode));
- strncpy(error->errmsg,"Error within grasbw_test",ERRMSG_LEN);
- gras_msg_new_and_send(msg->sock,GRASMSG_BW_RESULT,2,
- error,1,
- res,2);
- return 1;
- }
- res[0].timestamp = (unsigned int) gras_time();
- res[1].timestamp = (unsigned int) gras_time();
- gras_msg_new_and_send(msg->sock,GRASMSG_BW_RESULT,2,
- error,1,
- res,2);
- gras_msg_free(msg);
- return 1;
-#endif
}
int amok_bw_cb_sat_start(gras_socket_t expeditor,
CRITICAL0("amok_bw_cb_sat_begin: not implemented");
return 1;
}
-#if 0
-/* ***************************************************************************
- * Link saturation
- * ***************************************************************************/
-
-xbt_error_t grasbw_saturate_start(const char* from_name,unsigned int from_port,
- const char* to_name,unsigned int to_port,
- unsigned int msgSize, unsigned int timeout) {
- gras_sock_t *sock;
- xbt_error_t errcode;
- /* The request */
- SatExp_t *request;
- msgHost_t *target;
- /* answer */
- gras_msg_t *answer;
-
- if((errcode=gras_sock_client_open(from_name,from_port,&sock))) {
- fprintf(stderr,"%s:%d:saturate_start(): Error %s encountered while contacting peer\n",
- __FILE__,__LINE__,xbt_error_name(errcode));
- return errcode;
- }
- if (!(request=(SatExp_t *)malloc(sizeof(SatExp_t))) ||
- !(target=(msgHost_t*)malloc(sizeof(msgHost_t)))) {
- fprintf(stderr,"%s:%d:saturate_start(): Malloc error\n",__FILE__,__LINE__);
- gras_sock_close(sock);
- return malloc_error;
- }
-
- request->timeout=timeout;
- request->msgSize=msgSize;
-
- strcpy(target->host,to_name);
- target->port=to_port;
-
- if ((errcode=gras_msg_new_and_send(sock,GRASMSG_SAT_START, 2,
- target,1,
- request,1))) {
- fprintf(stderr,"%s:%d:saturate_start(): Error %s encountered while sending the request.\n",
- __FILE__,__LINE__,xbt_error_name(errcode));
- gras_sock_close(sock);
- return errcode;
- }
- if ((errcode=gras_msg_wait(120,GRASMSG_SAT_STARTED,&answer))) {
- fprintf(stderr,"%s:%d:saturate_start(): Error %s encountered while waiting for the ACK.\n",
- __FILE__,__LINE__,xbt_error_name(errcode));
- gras_sock_close(sock);
- return errcode;
- }
-
- if((errcode=gras_msg_ctn(answer,0,0,msgError_t).errcode)) {
- fprintf(stderr,"%s:%d:saturate_start(): Peer reported error %s (%s).\n",
- __FILE__,__LINE__,xbt_error_name(errcode),gras_msg_ctn(answer,0,0,msgError_t).errmsg);
- gras_msg_free(answer);
- gras_sock_close(sock);
- return errcode;
- }
-
- gras_msg_free(answer);
- gras_sock_close(sock);
- return no_error;
-}
-
-int grasbw_cbSatStart(gras_msg_t *msg) {
- gras_rawsock_t *raw;
- gras_sock_t *sock;
- xbt_error_t errcode;
- double start; /* time to timeout */
-
- /* specification of the test to run */
- char* to_name=gras_msg_ctn(msg,0,0,msgHost_t).host;
- unsigned int to_port=gras_msg_ctn(msg,0,0,msgHost_t).port;
-
- unsigned int msgSize=gras_msg_ctn(msg,1,0,SatExp_t).msgSize;
- unsigned int timeout=gras_msg_ctn(msg,1,0,SatExp_t).timeout;
- unsigned int raw_port;
-
- /* The request */
- SatExp_t *request;
- /* answer */
- gras_msg_t *answer;
-
- /*
- fprintf(stderr,"grasbw_cbSatStart(sd=%p)\n",msg->sock);
- fprintf(stderr,"(server=%d,raw=%d,fromPID=%d,toPID=%d,toHost=%p,toPort=%d,toChan=%d)\n",
- msg->sock->server_sock,msg->sock->raw_sock,msg->sock->from_PID,
- msg->sock->to_PID,msg->sock->to_host,msg->sock->to_port,msg->sock->to_chan);
- */
-
- /* Negociate the saturation with the peer */
- if((errcode=gras_sock_client_open(to_name,to_port,&sock))) {
- fprintf(stderr,"cbSatStart(): Error %s encountered while contacting peer\n",
- xbt_error_name(errcode));
- grasRepportError(msg->sock,GRASMSG_SAT_STARTED,1,
- "cbSatStart: Severe error: Cannot send error status to requester!!\n",
- errcode,"Cannot contact peer.\n");
- return 1;
- }
- if (!(request=(SatExp_t *)malloc(sizeof(SatExp_t)))) {
- fprintf(stderr,"cbSatStart(): Malloc error\n");
- gras_sock_close(sock);
- grasRepportError(msg->sock,GRASMSG_SAT_STARTED,1,
- "cbSatStart: Severe error: Cannot send error status to requester!!\n",
- malloc_error,"Cannot build request.\n");
- return 1;
- }
-
- request->timeout=gras_msg_ctn(msg,1,0,SatExp_t).timeout;
- request->msgSize=gras_msg_ctn(msg,1,0,SatExp_t).msgSize;
-
- if ((errcode=gras_msg_new_and_send(sock,GRASMSG_SAT_BEGIN, 1,
- request,1))) {
- fprintf(stderr,"cbSatStart(): Error %s encountered while sending the request.\n",
- xbt_error_name(errcode));
- grasRepportError(msg->sock,GRASMSG_SAT_STARTED,1,
- "cbSatStart: Severe error: Cannot send error status to requester!!\n",
- errcode,"Cannot send request.\n");
- gras_sock_close(sock);
- return 1;
- }
-
- if ((errcode=gras_msg_wait(120,GRASMSG_SAT_BEGUN,&answer))) {
- fprintf(stderr,"cbSatStart(): Error %s encountered while waiting for the ACK.\n",
- xbt_error_name(errcode));
- gras_sock_close(sock);
-
- grasRepportError(msg->sock,GRASMSG_SAT_STARTED,1,
- "cbSatStart: Severe error: Cannot send error status to requester!!\n",
- errcode,
- "Cannot receive the ACK.\n");
- return 1;
- }
-
- if((errcode=gras_msg_ctn(answer,0,0,msgError_t).errcode)) {
- fprintf(stderr,"cbSatStart(): Peer reported error %s (%s).\n",
- xbt_error_name(errcode),gras_msg_ctn(answer,0,0,msgError_t).errmsg);
-
- grasRepportError(msg->sock,GRASMSG_SAT_STARTED,1,
- "cbSatStart: Severe error: Cannot send error status to requester!!\n",
- errcode,
- "Peer repported '%s'.\n",gras_msg_ctn(answer,0,0,msgError_t).errmsg);
- gras_msg_free(answer);
- gras_sock_close(sock);
- return 1;
- }
-
- raw_port=gras_msg_ctn(answer,1,0,SatExp_t).port;
-
- if ((errcode=gras_rawsock_client_open(to_name,raw_port,msgSize,&raw))) {
- fprintf(stderr,"cbSatStart(): Error %s while opening raw socket to %s:%d.\n",
- xbt_error_name(errcode),to_name,gras_msg_ctn(answer,1,0,SatExp_t).port);
-
- grasRepportError(msg->sock,GRASMSG_SAT_STARTED,1,
- "cbSatStart: Severe error: Cannot send error status to requester!!\n",
- errcode,"Cannot open raw socket.\n");
- gras_sock_close(sock);
- return 1;
- }
-
- /* send a train of data before repporting that XP is started */
- if ((errcode=gras_rawsock_send(raw,msgSize,msgSize))) {
- fprintf(stderr,"cbSatStart: Failure %s during raw send\n",xbt_error_name(errcode));
- grasRepportError(msg->sock,GRASMSG_SAT_STARTED,1,
- "cbSatStart: Severe error: Cannot send error status to requester!!\n",
- errcode,"Cannot raw send.\n");
- gras_sock_close(sock);
- gras_rawsock_close(raw);
- return 1;
- }
-
- grasRepportError(msg->sock,GRASMSG_SAT_STARTED,1,
- "cbSatStart: Severe error: Cannot send error status to requester!!\n",
- no_error,"Saturation started");
- gras_msg_free(answer);
- gras_msg_free(msg);
-
- /* Do the saturation until we get a SAT_STOP message or until we timeout the whole XP*/
- start=gras_time();
- while (gras_msg_wait(0,GRASMSG_SAT_STOP,&msg)==timeout_error &&
- gras_time()-start < timeout) {
- if ((errcode=gras_rawsock_send(raw,msgSize,msgSize))) {
- fprintf(stderr,"cbSatStart: Failure %s during raw send\n",xbt_error_name(errcode));
- /* our error message do not interess anyone. SAT_STOP will do nothing. */
- gras_sock_close(sock);
- gras_rawsock_close(raw);
- return 1;
- }
- }
- if (gras_time()-start > timeout) {
- fprintf(stderr,"The saturation experiment did timeout. Stop it NOW\n");
- gras_sock_close(sock);
- gras_rawsock_close(raw);
- return 1;
- }
-
- /* Handle the SAT_STOP which broke the previous while */
-
- if ((errcode=gras_msg_new_and_send(sock, GRASMSG_SAT_END,0))) {
- fprintf(stderr,"cbSatStart(): Cannot tell peer to stop saturation\n");
-
- grasRepportError(msg->sock,GRASMSG_SAT_STOPPED,1,
- "cbSatStart: Severe error: Cannot send error status to requester!!\n",
- errcode,"Sending SAT_END to peer failed.\n");
- gras_sock_close(sock);
- gras_rawsock_close(raw);
- return 1;
- }
-
- if ((errcode=gras_msg_wait(60,GRASMSG_SAT_ENDED,&answer))) {
- fprintf(stderr,"cbSatStart(): Peer didn't ACK the end\n");
-
- grasRepportError(msg->sock,GRASMSG_SAT_STOPPED,1,
- "cbSatStart: Severe error: Cannot send error status to requester!!\n",
- errcode,"Receiving SAT_ENDED from peer failed.\n");
- gras_sock_close(sock);
- gras_rawsock_close(raw);
- return 1;
- }
- grasRepportError(msg->sock,GRASMSG_SAT_STOPPED,1,
- "cbSatStart: Severe error: Cannot send error status to requester!!\n",
- no_error,"");
-
- gras_sock_close(sock);
- gras_rawsock_close(raw);
- gras_msg_free(answer);
- gras_msg_free(msg);
-
- return 1;
-}
-
-int grasbw_cbSatBegin(gras_msg_t *msg) {
- gras_rawsock_t *raw;
- xbt_error_t errcode;
- double start; /* timer */
- /* request */
- unsigned int msgSize=gras_msg_ctn(msg,0,0,SatExp_t).msgSize;
- unsigned int timeout=gras_msg_ctn(msg,0,0,SatExp_t).timeout;
- /* answer */
- SatExp_t *request;
- msgError_t *error;
-
- if (!(request=(SatExp_t*)malloc(sizeof(SatExp_t))) ||
- !(error=(msgError_t *)malloc(sizeof(msgError_t)))) {
- fprintf(stderr,"cbSatBegin(): Malloc error\n");
- grasRepportError(msg->sock,GRASMSG_SAT_BEGUN,2,
- "cbSatBegin: Severe error: Cannot send error status to requester!!\n",
- malloc_error,"Malloc error");
- return 1;
- }
-
- if ((errcode=gras_rawsock_server_open(6666,8000,msgSize,&raw))) {
- fprintf(stderr,"cbSatBegin(): Error %s encountered while opening a raw socket\n",
- xbt_error_name(errcode));
- grasRepportError(msg->sock,GRASMSG_SAT_BEGUN,2,
- "cbSatBegin: Severe error: Cannot send error status to requester!!\n",
- errcode,"Cannot open raw socket");
- return 1;
- }
- request->port=gras_rawsock_get_peer_port(raw);
- request->msgSize=msgSize;
- error->errcode=no_error;
- error->errmsg[0]='\0';
- if ((errcode=gras_msg_new_and_send(msg->sock,GRASMSG_SAT_BEGUN,2,
- error,1,
- request,1))) {
- fprintf(stderr,"cbSatBegin(): Error %s encountered while send ACK to peer\n",
- xbt_error_name(errcode));
- return 1;
- }
- gras_msg_free(msg);
-
- start=gras_time();
- while (gras_msg_wait(0,GRASMSG_SAT_END,&msg)==timeout_error &&
- gras_time() - start < timeout) {
- errcode=gras_rawsock_recv(raw,msgSize,msgSize,1);
- if (errcode != timeout_error && errcode != no_error) {
- fprintf(stderr,"cbSatBegin: Failure %s during raw receive\n",xbt_error_name(errcode));
- /* our error message do not interess anyone. SAT_END will do nothing. */
- /* (if timeout'ed, it may be because the sender stopped emission. so survive it) */
- return 1;
- }
- }
- if (gras_time()-start > timeout) {
- fprintf(stderr,"The saturation experiment did timeout. Stop it NOW.\n");
- gras_rawsock_close(raw);
- return 1;
- }
-
- grasRepportError(msg->sock,GRASMSG_SAT_ENDED,1,
- "cbSatBegin: Cannot send SAT_ENDED.\n",
- no_error,"");
- gras_rawsock_close(raw);
- gras_msg_free(msg);
- return 1;
-}
-
-xbt_error_t grasbw_saturate_stop(const char* from_name,unsigned int from_port,
- const char* to_name,unsigned int to_port) {
- xbt_error_t errcode;
- gras_sock_t *sock;
- gras_msg_t *answer;
-
- if((errcode=gras_sock_client_open(from_name,from_port,&sock))) {
- fprintf(stderr,"saturate_stop(): Error %s encountered while contacting peer\n",
- xbt_error_name(errcode));
- return errcode;
- }
-
- if ((errcode=gras_msg_new_and_send(sock,GRASMSG_SAT_STOP,0))) {
- fprintf(stderr,"saturate_stop(): Error %s encountered while sending request\n",
- xbt_error_name(errcode));
- gras_sock_close(sock);
- return errcode;
- }
-
- if ((errcode=gras_msg_wait(120,GRASMSG_SAT_STOPPED,&answer))) {
- fprintf(stderr,"saturate_stop(): Error %s encountered while receiving ACK\n",
- xbt_error_name(errcode));
- gras_sock_close(sock);
- return errcode;
- }
-
- if((errcode=gras_msg_ctn(answer,0,0,msgError_t).errcode)) {
- fprintf(stderr,"saturate_stop(): Peer reported error %s (%s).\n",
- xbt_error_name(errcode),gras_msg_ctn(answer,0,0,msgError_t).errmsg);
- gras_msg_free(answer);
- gras_sock_close(sock);
- return errcode;
- }
-
- gras_msg_free(answer);
- gras_sock_close(sock);
-
- return no_error;
-}
-#endif
