Yet some more logging

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

diff --git a/src/amok/Bandwidth/saturate.c b/src/amok/Bandwidth/saturate.c
index 1fd993b..1f5e2d8 100644 (file)
--- 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,
@@ -105,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,
@@ -176,9 +186,8 @@ 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 (duration==0 || (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)
@@ -186,16 +195,13 @@ 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);
     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 +212,9 @@ void amok_bw_saturate_begin(const char* to_name,unsigned int to_port,
 
     gras_msg_rpcreturn(60,&ctx,&answer);
     free(answer);
+  } else {
+    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);
@@ -279,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;