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

diff --git a/src/amok/Bandwidth/saturate.c b/src/amok/Bandwidth/saturate.c
index 1fd993b1be..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);