X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6521142974bf561e632684f99fd1708726e474a0..d84ec6831b616ae6f3706193ba326f4bded68f64:/src/amok/Bandwidth/saturate.c

diff --git a/src/amok/Bandwidth/saturate.c b/src/amok/Bandwidth/saturate.c
index 6b541f925f..bb78fc8561 100644
--- a/src/amok/Bandwidth/saturate.c
+++ b/src/amok/Bandwidth/saturate.c
@@ -10,14 +10,15 @@
 #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(bw);
-XBT_LOG_DEFAULT_CATEGORY(bw);
+XBT_LOG_EXTERNAL_CATEGORY(amok_bw);
+XBT_LOG_DEFAULT_CATEGORY(amok_bw);
 
 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);
 
 
 void amok_bw_sat_init(void) {
+  gras_datadesc_type_t bw_res_desc=gras_datadesc_by_name("bw_res_t");
   gras_datadesc_type_t sat_request_desc;
   /* Build the saturation datatype descriptions */ 
   
@@ -31,7 +32,7 @@ void amok_bw_sat_init(void) {
   /* Register the saturation messages */
   gras_msgtype_declare_rpc("amok_bw_sat start", sat_request_desc, NULL);
   gras_msgtype_declare_rpc("amok_bw_sat begin", sat_request_desc, sat_request_desc);
-  gras_msgtype_declare_rpc("amok_bw_sat stop",  NULL,             NULL);
+  gras_msgtype_declare_rpc("amok_bw_sat stop",  NULL,             bw_res_desc);
 
 }
 void amok_bw_sat_join(void) {
@@ -91,6 +92,12 @@ void amok_bw_saturate_start(const char* from_name,unsigned int from_port,
 /* Asked to begin a saturation */
 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);
+
+  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);
+	
   gras_msg_rpcreturn(60,ctx, NULL);
   amok_bw_saturate_begin(request->host.name,request->host.port,
 			 request->msg_size, request->duration,
@@ -178,7 +185,6 @@ void amok_bw_saturate_begin(const char* to_name,unsigned int to_port,
 
   } while (saturate_further && elapsed < duration);
 
-  INFO2("Saturation from %s to %s stopped",gras_os_myname(),to_name);
   bw = ((double)(packet_sent*msg_size)) / elapsed;
 
   if (elapsed_res)
@@ -196,6 +202,8 @@ void amok_bw_saturate_begin(const char* to_name,unsigned int to_port,
     bw_res_t answer = xbt_new(s_bw_res_t,1);
     s_gras_msg_cb_ctx_t ctx;
 
+    INFO3("Saturation from %s to %s stopped by %s",
+	  gras_os_myname(),to_name, gras_socket_peer_name(msg_got.expe));
     answer->timestamp=gras_os_time();
     answer->sec=elapsed;
     answer->bw=bw;
@@ -206,6 +214,9 @@ void amok_bw_saturate_begin(const char* to_name,unsigned int to_port,
 
     gras_msg_rpcreturn(60,&ctx,&answer);
     free(answer);
+  } else {
+    INFO3("Saturation from %s to %s elapsed after %f sec",
+	  gras_os_myname(),to_name,duration);
   }
   
   gras_socket_close(meas);
@@ -275,279 +286,12 @@ static int amok_bw_cb_sat_begin(gras_msg_cb_ctx_t ctx, void *payload){
  *
  */
 void amok_bw_saturate_stop(const char* from_name,unsigned int from_port,
-			   /*out*/ unsigned int *time, unsigned int *bw) {
+			   /*out*/ double *time, double *bw) {
 
   gras_socket_t sock = gras_socket_client(from_name,from_port);
-  gras_msg_rpccall(sock,60,gras_msgtype_by_name("amok_bw_sat stop"),NULL,NULL);
+  bw_res_t answer;
+  gras_msg_rpccall(sock,60,gras_msgtype_by_name("amok_bw_sat stop"),NULL,&answer);
   gras_socket_close(sock);
+  if (time) *time=answer->sec;
+  if (bw)   *bw  =answer->bw;
 }
-
-
-#if 0
-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;
-
-
-  /* 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