Do obey messages asking to stop the saturation

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

diff --git a/src/amok/Bandwidth/saturate.c b/src/amok/Bandwidth/saturate.c
index d6cfa91..b43c60e 100644 (file)
--- a/src/amok/Bandwidth/saturate.c
+++ b/src/amok/Bandwidth/saturate.c
@@ -186,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 (duration==0 || saturate_further && elapsed < duration);
+  } while (saturate_further && (duration!=0 && elapsed < duration));
 
   bw = ((double)(packet_sent*msg_size)) / elapsed;
 
@@ -213,7 +213,7 @@ 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 (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);
   }
   
@@ -288,6 +288,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;