Make a log message more explicit

[simgrid.git] / src / amok / Bandwidth / saturate.c

diff --git a/src/amok/Bandwidth/saturate.c b/src/amok/Bandwidth/saturate.c
index bb78fc8..bdd42d9 100644 (file)
--- a/src/amok/Bandwidth/saturate.c
+++ b/src/amok/Bandwidth/saturate.c
@@ -112,6 +112,9 @@ static int amok_bw_cb_sat_start(gras_msg_cb_ctx_t ctx, void *payload){
  *
  * 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.
+ *
+ * If duration=0, the experiment will never timeout (you then have to manually
+ * stop it)
  */
 void amok_bw_saturate_begin(const char* to_name,unsigned int to_port,
                            unsigned int msg_size, double duration,
@@ -183,7 +186,7 @@ void amok_bw_saturate_begin(const char* to_name,unsigned int to_port,
     elapsed=gras_os_time()-start;
     VERB2("elapsed %f duration %f",elapsed, duration);
 
-  } while (saturate_further && elapsed < duration);
+  } while (saturate_further && (duration==0 || elapsed < duration));
 
   bw = ((double)(packet_sent*msg_size)) / elapsed;
 
@@ -192,11 +195,6 @@ void amok_bw_saturate_begin(const char* to_name,unsigned int to_port,
   if (bw_res)
     *bw_res = bw;
 
-  if (elapsed >= duration) {
-    INFO2("Saturation experiment terminated. Took %f sec (achieving %f kb/s)",
-         elapsed, bw/1024.0);
-  }
-
   /* If someone stopped us, inform him about the achieved bandwidth */
   if (msg_got.expe) {
     bw_res_t answer = xbt_new(s_bw_res_t,1);
@@ -215,8 +213,8 @@ 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);
+    INFO4("Saturation from %s to %s elapsed after %f sec (achieving %f kb/s)",
+         gras_os_myname(),to_name,elapsed,bw/1024.0);
   }
   
   gras_socket_close(meas);
@@ -229,6 +227,7 @@ static int amok_bw_cb_sat_begin(gras_msg_cb_ctx_t ctx, void *payload){
   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) {
@@ -269,7 +268,10 @@ static int amok_bw_cb_sat_begin(gras_msg_cb_ctx_t ctx, void *payload){
       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); 
@@ -290,6 +292,8 @@ void amok_bw_saturate_stop(const char* from_name,unsigned int from_port,
 
   gras_socket_t sock = gras_socket_client(from_name,from_port);
   bw_res_t answer;
+  VERB2("Ask %s:%d to stop the saturation",
+       from_name,from_port);
   gras_msg_rpccall(sock,60,gras_msgtype_by_name("amok_bw_sat stop"),NULL,&answer);
   gras_socket_close(sock);
   if (time) *time=answer->sec;