X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e0b0a957106c8c55b7aa24f118ed5862e98064d..b98e7805e2b634992db0d8301ec0e13cf66b3c71:/src/amok/Bandwidth/bandwidth.c

diff --git a/src/amok/Bandwidth/bandwidth.c b/src/amok/Bandwidth/bandwidth.c
index d0d82a6980..f206a41944 100644
--- a/src/amok/Bandwidth/bandwidth.c
+++ b/src/amok/Bandwidth/bandwidth.c
@@ -1,12 +1,11 @@
 /* $Id$ */
 
-/* amok_bandwidth - Bandwidth tests facilities    */
+/* amok_bandwidth - Bandwidth tests facilities                              */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2003, 2004 the OURAGAN project.                            */
+/* Copyright (c) 2003-5 Martin Quinson. All rights reserved.                */
 
 /* This program is free software; you can redistribute it and/or modify it
-   under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "amok/Bandwidth/bandwidth_private.h"
 #include "gras/messages.h"
@@ -19,51 +18,55 @@ static short _amok_bw_initialized = 0;
 void amok_bw_init(void) {
   gras_datadesc_type_t bw_request_desc, bw_res_desc, sat_request_desc;
 
-  if (_amok_bw_initialized)
-     return;
-   
   amok_base_init();
-   
-  /* Build the datatype descriptions */ 
-  bw_request_desc = gras_datadesc_struct("s_bw_request_t");
-  gras_datadesc_struct_append(bw_request_desc,"host",gras_datadesc_by_name("xbt_host_t"));
-  gras_datadesc_struct_append(bw_request_desc,"buf_size",gras_datadesc_by_name("unsigned int"));
-  gras_datadesc_struct_append(bw_request_desc,"exp_size",gras_datadesc_by_name("unsigned int"));
-  gras_datadesc_struct_append(bw_request_desc,"msg_size",gras_datadesc_by_name("unsigned int"));
-  gras_datadesc_struct_close(bw_request_desc);
-  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"));
-  gras_datadesc_struct_close(bw_res_desc);
-  bw_res_desc = gras_datadesc_ref("bw_res_t",bw_res_desc);
-
-  sat_request_desc = gras_datadesc_struct("s_sat_request_desc_t");
-  gras_datadesc_struct_append(sat_request_desc,"host",gras_datadesc_by_name("xbt_host_t"));
-  gras_datadesc_struct_append(sat_request_desc,"msg_size",gras_datadesc_by_name("unsigned int"));
-  gras_datadesc_struct_append(sat_request_desc,"timeout",gras_datadesc_by_name("unsigned int"));
-  gras_datadesc_struct_close(sat_request_desc);
-  sat_request_desc = gras_datadesc_ref("sat_request_t",sat_request_desc);
-   
-  /* Register the bandwidth messages */
-  gras_msgtype_declare("BW request",       bw_request_desc);
-  gras_msgtype_declare("BW result",        bw_res_desc);
-  gras_msgtype_declare("BW handshake",     bw_request_desc);
-  gras_msgtype_declare("BW handshake ACK", bw_request_desc);
-
-  /* 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 begin",   sat_request_desc);
-  gras_msgtype_declare("SAT begun",   gras_datadesc_by_name("amok_remoterr_t"));
-  gras_msgtype_declare("SAT end",     NULL);
-  gras_msgtype_declare("SAT ended",   gras_datadesc_by_name("amok_remoterr_t"));
-  gras_msgtype_declare("SAT stop",    NULL);
-  gras_msgtype_declare("SAT stopped", gras_datadesc_by_name("amok_remoterr_t"));
 
+  if (! _amok_bw_initialized) {
+	
+     /* Build the datatype descriptions */ 
+     bw_request_desc = gras_datadesc_struct("s_bw_request_t");
+     gras_datadesc_struct_append(bw_request_desc,"host",
+				 gras_datadesc_by_name("xbt_host_t"));
+     gras_datadesc_struct_append(bw_request_desc,"buf_size",
+				 gras_datadesc_by_name("unsigned long int"));
+     gras_datadesc_struct_append(bw_request_desc,"exp_size",
+				 gras_datadesc_by_name("unsigned long int"));
+     gras_datadesc_struct_append(bw_request_desc,"msg_size",
+				 gras_datadesc_by_name("unsigned long int"));
+     gras_datadesc_struct_close(bw_request_desc);
+     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"));
+     gras_datadesc_struct_close(bw_res_desc);
+     bw_res_desc = gras_datadesc_ref("bw_res_t",bw_res_desc);
+
+     sat_request_desc = gras_datadesc_struct("s_sat_request_desc_t");
+     gras_datadesc_struct_append(sat_request_desc,"host",gras_datadesc_by_name("xbt_host_t"));
+     gras_datadesc_struct_append(sat_request_desc,"msg_size",gras_datadesc_by_name("unsigned int"));
+     gras_datadesc_struct_append(sat_request_desc,"timeout",gras_datadesc_by_name("unsigned int"));
+     gras_datadesc_struct_close(sat_request_desc);
+     sat_request_desc = gras_datadesc_ref("sat_request_t",sat_request_desc);
+     
+     /* Register the bandwidth messages */
+     gras_msgtype_declare("BW request",       bw_request_desc);
+     gras_msgtype_declare("BW result",        bw_res_desc);
+     gras_msgtype_declare("BW handshake",     bw_request_desc);
+     gras_msgtype_declare("BW handshake ACK", bw_request_desc);
+     
+     /* 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 begin",   sat_request_desc);
+     gras_msgtype_declare("SAT begun",   gras_datadesc_by_name("amok_remoterr_t"));
+     gras_msgtype_declare("SAT end",     NULL);
+     gras_msgtype_declare("SAT ended",   gras_datadesc_by_name("amok_remoterr_t"));
+     gras_msgtype_declare("SAT stop",    NULL);
+     gras_msgtype_declare("SAT stopped", gras_datadesc_by_name("amok_remoterr_t"));
+  }
+   
   /* Register the callbacks */
   gras_cb_register(gras_msgtype_by_name("BW request"),
 		   &amok_bw_cb_bw_request);
@@ -102,42 +105,49 @@ void amok_bw_exit(void) {
  * ***************************************************************************/
 
 /**
- * amok_bw_test:
+ * \brief bandwidth measurement between localhost and @peer
  * 
- * Conduct a test between the local host and @peer, and 
- * report the result in last args
+ * Results are reported in last args, and sizes are in kb.
  */
 xbt_error_t amok_bw_test(gras_socket_t peer,
-			  unsigned int buf_size,unsigned int exp_size,unsigned int msg_size,
-			  /*OUT*/ double *sec, double *bw) {
-  gras_socket_t rawIn,rawOut; /* raw sockets for the experiments */
-  gras_socket_t sock_dummy; /* ignored arg to msg_wait */
+			 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,measIn,measOut;
   int port;
   xbt_error_t errcode;
   bw_request_t request,request_ack;
   
   for (port = 5000, errcode = system_error;
-       errcode == system_error;
-       errcode = gras_socket_server_ext(++port,buf_size,1,&rawIn));
+       errcode == system_error && port < 10000;
+       errcode = gras_socket_server_ext(++port,buf_size,1,&measMasterIn));
   if (errcode != no_error) {
-    ERROR1("Error %s encountered while opening a raw socket",
+    ERROR1("Error %s encountered while opening a measurement socket",
 	   xbt_error_name(errcode));
     return errcode;
   }
 	
   request=xbt_new0(s_bw_request_t,1);
-  request->buf_size=buf_size;
-  request->exp_size=exp_size;
-  request->msg_size=msg_size;
+  request->buf_size=buf_size*1024;
+  request->exp_size=exp_size*1024;
+  request->msg_size=msg_size*1024;
   request->host.name = NULL;
-  request->host.port = gras_socket_my_port(rawIn);
-  INFO1("Send an handshake to get the dude connect to port %d on me", request->host.port);
+  request->host.port = gras_socket_my_port(measMasterIn);
+  VERB5("Handshaking with %s:%d to connect it back on my %d (expsize=%ld kb= %ld b)", 
+	gras_socket_peer_name(peer),gras_socket_peer_port(peer), request->host.port,
+	buf_size,request->buf_size);
 
   if ((errcode=gras_msg_send(peer,gras_msgtype_by_name("BW handshake"),&request))) {
     ERROR1("Error %s encountered while sending the BW request.", xbt_error_name(errcode));
     return errcode;
   }
-  if ((errcode=gras_msg_wait(60,gras_msgtype_by_name("BW handshake ACK"),&sock_dummy,&request_ack))) {
+  TRY(gras_socket_meas_accept(measMasterIn,&measIn));
+
+  if ((errcode=gras_msg_wait(60,gras_msgtype_by_name("BW handshake ACK"),
+			     NULL,&request_ack))) {
     ERROR1("Error %s encountered while waiting for the answer to BW request.\n",
 	    xbt_error_name(errcode));
     return errcode;
@@ -145,173 +155,187 @@ xbt_error_t amok_bw_test(gras_socket_t peer,
    
   /* FIXME: What if there is a remote error? */
    
-  if((errcode=gras_socket_client_ext(gras_socket_peer_name(peer),request_ack->host.port, buf_size,1,&rawOut))) {
-    ERROR3("Error %s encountered while opening the raw socket to %s:%d for BW test\n",
+  if((errcode=gras_socket_client_ext(gras_socket_peer_name(peer),
+				     request_ack->host.port, 
+				     request->buf_size,1,&measOut))) {
+    ERROR3("Error %s encountered while opening the measurement socket to %s:%d for BW test\n",
 	    xbt_error_name(errcode),gras_socket_peer_name(peer),request_ack->host.port);
     return errcode;
   }
-  xbt_free(request_ack);
-  INFO0("Got ACK");
+  DEBUG1("Got ACK; conduct the experiment (msg_size=%ld)",request->msg_size);
 
   *sec=gras_os_time();
-  if ((errcode=gras_socket_raw_send(rawOut,120,exp_size,msg_size)) ||
-      (errcode=gras_socket_raw_recv(rawIn,120,1,1))) {
+  TRY(gras_socket_meas_send(measOut,120,request->exp_size,request->msg_size));
+  TRY(gras_socket_meas_recv(measIn,120,1,1));
+
+  /*catch
     ERROR1("Error %s encountered while sending the BW experiment.",
 	    xbt_error_name(errcode));
-    gras_socket_close(rawOut);
-    gras_socket_close(rawIn);
-    return errcode;
-  }
+    gras_socket_close(measOut);
+    gras_socket_close(measMasterIn);
+    gras_socket_close(measIn);
+  */
+
   *sec = gras_os_time() - *sec;
-  *bw = ((double)exp_size /* 8.0*/) / *sec / (1024.0 *1024.0);
-INFO0("DOOONE");
-   
-  gras_socket_close(rawIn);
-  gras_socket_close(rawOut);
-  return no_error;
+  *bw = ((double)exp_size) / *sec;
+
+  free(request_ack);
+  free(request);
+  if (measIn != measMasterIn)
+    gras_socket_close(measIn);
+  gras_socket_close(measMasterIn);
+  gras_socket_close(measOut);
+  return errcode;
 }
 
 
 /* Callback to the "BW handshake" message: 
-   opens a server raw socket,
+   opens a server measurement socket,
    indicate its port in an "BW handshaked" message,
-   receive the corresponding data on the raw socket, 
-   close the raw socket
+   receive the corresponding data on the measurement socket, 
+   close the measurment socket
+
+   sizes are in byte (got converted from kb my expeditor)
 */
 int amok_bw_cb_bw_handshake(gras_socket_t  expeditor,
 			    void          *payload) {
-  gras_socket_t rawIn,rawOut;
+  gras_socket_t measMasterIn,measIn,measOut;
   bw_request_t request=*(bw_request_t*)payload;
   bw_request_t answer;
   xbt_error_t errcode;
   int port;
   
-  INFO2("Got an handshake to connect to %s:%d",
-	request->host.name,request->host.port);
-     
+  VERB5("Handshaked to connect to %s:%d (sizes: buf=%lu exp=%lu msg=%lu)",
+	gras_socket_peer_name(expeditor),request->host.port,
+	request->buf_size,request->exp_size,request->msg_size);     
+
+  /* Build our answer */
   answer = xbt_new0(s_bw_request_t,1);
   
-  for (port = 5000, errcode = system_error;
+  for (port = 6000, errcode = system_error;
        errcode == system_error;
-       errcode = gras_socket_server_ext(++port,request->buf_size,1,&rawIn));
+       errcode = gras_socket_server_ext(++port,request->buf_size,1,&measMasterIn));
   if (errcode != no_error) {
-    ERROR1("Error %s encountered while opening a raw socket", xbt_error_name(errcode));
+    ERROR1("Error %s encountered while opening a measurement server socket", xbt_error_name(errcode));
     /* FIXME: tell error to remote */
     return 1;
   }
+   
+  answer->buf_size=request->buf_size;
+  answer->exp_size=request->exp_size;
+  answer->msg_size=request->msg_size;
+  answer->host.port=gras_socket_my_port(measMasterIn);
 
-  if ((errcode=gras_socket_client_ext(gras_socket_peer_name(expeditor),request->host.port,
-				      request->buf_size,1,&rawOut))) { 
-    ERROR3("Error '%s' encountered while opening a raw socket to %s:%d", 
+  /* Don't connect asap to leave time to other side to enter the accept() */
+  if ((errcode=gras_socket_client_ext(gras_socket_peer_name(expeditor),
+				      request->host.port,
+				      request->buf_size,1,&measOut))) { 
+    ERROR3("Error '%s' encountered while opening a measurement socket back to %s:%d", 
 	   xbt_error_name(errcode),gras_socket_peer_name(expeditor),request->host.port);
     /* FIXME: tell error to remote */
     return 1;
   }
-   
-  answer->buf_size=request->buf_size;
-  answer->exp_size=request->exp_size;
-  answer->msg_size=request->msg_size;
-  answer->host.port=gras_socket_my_port(rawIn);
 
-  if ((errcode=gras_msg_send(expeditor,gras_msgtype_by_name("BW handshake ACK"),&answer))) {
+
+  if ((errcode=gras_msg_send(expeditor,
+			     gras_msgtype_by_name("BW handshake ACK"),
+			     &answer))) {
     ERROR1("Error %s encountered while sending the answer.",
 	    xbt_error_name(errcode));
-    gras_socket_close(rawIn);
-    gras_socket_close(rawOut);
+    gras_socket_close(measMasterIn);
+    gras_socket_close(measOut);
     /* FIXME: tell error to remote */
     return 1;
   }
-  INFO4("BW handshake answered. buf_size=%d exp_size=%d msg_size=%d port=%d",
+  TRY(gras_socket_meas_accept(measMasterIn,&measIn));
+  DEBUG4("BW handshake answered. buf_size=%lu exp_size=%lu msg_size=%lu port=%d",
 	answer->buf_size,answer->exp_size,answer->msg_size,answer->host.port);
-    
-  if ((errcode=gras_socket_raw_recv(rawIn, 120,request->exp_size,request->msg_size)) ||
-      (errcode=gras_socket_raw_send(rawOut,120,1,1))) {
+
+  TRY(gras_socket_meas_recv(measIn, 120,request->exp_size,request->msg_size));
+  TRY(gras_socket_meas_send(measOut,120,1,1));
+
+  /*catch
     ERROR1("Error %s encountered while receiving the experiment.",
 	    xbt_error_name(errcode));
-    gras_socket_close(rawIn);
-    gras_socket_close(rawOut);
-    /* FIXME: tell error to remote ? */
+    gras_socket_close(measMasterIn);
+    gras_socket_close(measIn);
+    gras_socket_close(measOut);
+    * FIXME: tell error to remote ? *
     return 1;
-  }
-  gras_socket_close(rawIn);
-  gras_socket_close(rawOut);
+    }*/
+
+  if (measIn != measMasterIn)
+    gras_socket_close(measMasterIn);
+  gras_socket_close(measIn);
+  gras_socket_close(measOut);
+  free(answer);
+  free(request);
+  DEBUG0("BW experiment done.");
   return 1;
 }
 
-int amok_bw_cb_bw_request(gras_socket_t    expeditor,
-			  void            *payload) {return 1;}
-
-int amok_bw_cb_sat_start(gras_socket_t     expeditor,
-			 void             *payload) {return 1;} 
-int amok_bw_cb_sat_begin(gras_socket_t     expeditor,
-			 void             *payload) {return 1;}
-
-#if 0
-/* function to request a BW test between two external hosts */
-xbt_error_t grasbw_request(const char* from_name,unsigned int from_port,
-			   const char* to_name,unsigned int to_port,
-			   unsigned int bufSize,unsigned int expSize,unsigned int msgSize,
-			   /*OUT*/ double *sec, double*bw) {
+/**
+ * \brief request a bandwidth measurement between two remote hosts
+ *
+ * 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) {
   
-  gras_sock_t *sock;
-  gras_msg_t *answer;
+  gras_socket_t sock;
   xbt_error_t errcode;
   /* The request */
-  BwExp_t *request;
-  msgHost_t *target;
+  bw_request_t request;
+  bw_res_t result;
 
-  if((errcode=gras_sock_client_open(from_name,from_port,&sock))) {
-    fprintf(stderr,"grasbw_request(): Error %s encountered while contacting the actuator\n",
-	    xbt_error_name(errcode));
-    return errcode;
-  }
-  if (!(request=(BwExp_t *)malloc(sizeof(BwExp_t))) ||
-      !(target=(msgHost_t*)malloc(sizeof(msgHost_t)))) {
-    fprintf(stderr,"grasbw_test(): Malloc error\n");
-    gras_sock_close(sock);
-    return malloc_error;    
-  }
+  request=xbt_new0(s_bw_request_t,1);
+  request->buf_size=buf_size;
+  request->exp_size=exp_size;
+  request->msg_size=msg_size;
 
-  request->bufSize=bufSize;
-  request->expSize=expSize;
-  request->msgSize=msgSize;
-  strcpy(target->host,to_name);
-  target->port=to_port;
-  
-  if ((errcode=gras_msg_new_and_send(sock,GRASMSG_BW_REQUEST, 2, 
-			      target,1,
-			      request,1))) {
-    fprintf(stderr,"grasbw_request(): Error %s encountered while sending the request.\n",
-	    xbt_error_name(errcode));
-    gras_sock_close(sock);
-    return errcode;
-  }
-  if ((errcode=gras_msg_wait(240,GRASMSG_BW_RESULT,&answer))) {
-    fprintf(stderr,"grasbw_request(): Error %s encountered while waiting for the answer.\n",
-	    xbt_error_name(errcode));
-    gras_sock_close(sock);
-    return errcode;
-  }
+  request->host.name = (char*)to_name;
+  request->host.port = to_port;
 
-  if((errcode=gras_msg_ctn(answer,0,0,msgError_t).errcode)) {
-    fprintf(stderr,"grasbw_request(): 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;
-  }
+  TRY(gras_socket_client(from_name,from_port,&sock));
+  TRY(gras_msg_send(sock,gras_msgtype_by_name("BW request"),&request));
+  free(request);
 
-  /*  fprintf(stderr,"sec=%p",gras_msg_ctn(answer,1,0,msgResult_t)); */
-  *sec=gras_msg_ctn(answer,1,0,msgResult_t).value;
-  *bw=gras_msg_ctn(answer,1,1,msgResult_t).value;
+  TRY(gras_msg_wait(240,gras_msgtype_by_name("BW result"),NULL, &result));
+  
+  *sec=result->sec;
+  *bw =result->bw;
 
-  gras_msg_free(answer);
-  gras_sock_close(sock);
+  VERB6("BW test between %s:%d and %s:%d took %f sec, achieving %f kb/s",
+	from_name,from_port, to_name,to_port,
+	*sec,*bw);
+
+  gras_socket_close(sock);
   return no_error;
 }
 
-int grasbw_cbBWRequest(gras_msg_t *msg) {
-  /* specification of the test to run */
+int amok_bw_cb_bw_request(gras_socket_t    expeditor,
+			  void            *payload) {
+			  
+  xbt_error_t errcode;			  
+  /* specification of the test to run, and our answer */
+  bw_request_t request = *(bw_request_t*)payload;
+  bw_res_t result = xbt_new0(s_bw_res,1);
+  gras_socket_t peer;
+
+  TRY(gras_socket_client(request->host.name,request->host.port,&peer));
+  TRY(amok_bw_test(peer,
+		   request->buf_size,request->exp_size,request->msg_size,
+		   &(result->sec),&(result->bw)));
+  gras_socket_close(peer);
+  free(request);
+  
+  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;
 
@@ -322,12 +346,6 @@ int grasbw_cbBWRequest(gras_msg_t *msg) {
   msgError_t *error;
   msgResult_t *res;
 
-  if (!(error=(msgError_t *)malloc(sizeof(msgError_t))) ||
-      !(res=(msgResult_t *)malloc(sizeof(msgResult_t) * 2))) {
-    fprintf(stderr,"%s:%d:grasbw_cbRequest: Malloc error\n",__FILE__,__LINE__);
-    return malloc_error;    
-  }
-
   if ((error->errcode=grasbw_test(to_name,to_port,bufSize,expSize,msgSize,
 				  &(res[0].value),&(res[1].value) ))) {
     fprintf(stderr,
@@ -346,8 +364,20 @@ int grasbw_cbBWRequest(gras_msg_t *msg) {
 		 res,2);
   gras_msg_free(msg);
   return 1;
+#endif
 }
 
+int amok_bw_cb_sat_start(gras_socket_t     expeditor,
+			 void             *payload) {
+   CRITICAL0("amok_bw_cb_sat_start; not implemented");
+   return 1;
+} 
+int amok_bw_cb_sat_begin(gras_socket_t     expeditor,
+			 void             *payload) {
+   CRITICAL0("amok_bw_cb_sat_begin: not implemented");
+   return 1;
+}
+#if 0
 /* ***************************************************************************
  * Link saturation
  * ***************************************************************************/