Remove Darina's cruft. No idea why it survived so long

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

diff --git a/src/amok/Bandwidth/saturate.c b/src/amok/Bandwidth/saturate.c
index 7631d53..5b13d13 100644 (file)
--- a/src/amok/Bandwidth/saturate.c
+++ b/src/amok/Bandwidth/saturate.c
@@ -9,6 +9,7 @@
 
 #include "amok/Bandwidth/bandwidth_private.h"
 #include "gras/Msg/msg_private.h" /* FIXME: This mucks with contextes to answer RPC directly */
+#include "xbt/ex.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(amok_bw_sat,amok_bw,"Everything concerning the SATuration part of the amok_bw module");
 
@@ -70,9 +71,10 @@ void amok_bw_saturate_start(const char* from_name,unsigned int from_port,
                            const char* to_name,unsigned int to_port,
                            unsigned int msg_size, double duration) {
   gras_socket_t sock;
-
+  xbt_ex_t e;
   sat_request_t request = xbt_new(s_sat_request_t,1);
 
+  INFO4("Start from_name %s:%d -> to_name %s:%d",from_name,from_port,to_name,to_port);
   sock = gras_socket_client(from_name,from_port);
 
   request->peer.name = (char*)to_name;
@@ -81,7 +83,6 @@ void amok_bw_saturate_start(const char* from_name,unsigned int from_port,
   request->duration=duration;
   request->msg_size=msg_size;
 
-
   gras_msg_rpccall(sock,60,gras_msgtype_by_name("amok_bw_sat start"),&request, NULL);
 
   free(request);
@@ -92,16 +93,22 @@ void amok_bw_saturate_start(const char* from_name,unsigned int from_port,
 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);
+ 
+  xbt_ex_t e;
 
   VERB4("Asked by %s:%d to start a saturation to %s:%d",
        gras_socket_peer_name(expeditor),gras_socket_peer_port(expeditor),
        request->peer.name,request->peer.port);
        
   gras_msg_rpcreturn(60,ctx, NULL);
+
   amok_bw_saturate_begin(request->peer.name,request->peer.port,
+
                         request->msg_size, request->duration,
                         NULL,NULL);
+ 
   free(request->peer.name);
+
   free(request);
   return 1;
 }
@@ -148,6 +155,7 @@ void amok_bw_saturate_begin(const char* to_name,unsigned int to_port,
   request->peer.name = NULL;
   request->peer.port = 0;
 
+
   /* Size autodetection on need */
   if (!msg_size) {
     double bw;
@@ -161,6 +169,7 @@ void amok_bw_saturate_begin(const char* to_name,unsigned int to_port,
   }
    
   /* Launch the saturation */
+
   ctx = gras_msg_rpc_async_call(peer_cmd, 60, 
                                gras_msgtype_by_name("amok_bw_sat begin"),
                                                  &request);
@@ -169,10 +178,11 @@ void amok_bw_saturate_begin(const char* to_name,unsigned int to_port,
   meas=gras_socket_client_ext( to_name, request->peer.port,
                               0 /*bufsize: auto*/,
                               1 /*meas: true*/);
+
   free(request);
 
   gras_socket_close(peer_cmd);
-  INFO2("Saturation(%s->%s) started",gras_os_myname(),to_name);
+  INFO4("Saturation(%s:%d->%s:%d) started",gras_os_myname(),gras_os_myport(),to_name,to_port);
 
   /* Start experiment */
   start=gras_os_time();
@@ -215,8 +225,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));
+    INFO6("Saturation from %s:%d to %s:%d stopped by %s:%d",
+         gras_os_myname(),gras_os_myport(),to_name,to_port, gras_socket_peer_name(msg_got.expe),gras_socket_peer_port(msg_got.expe));
     answer->timestamp=gras_os_time();
     answer->sec=elapsed;
     answer->bw=bw;
@@ -228,8 +238,8 @@ 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);
+    INFO6("Saturation from %s:%d to %s:%d elapsed after %f sec (achieving %f kb/s)",
+         gras_os_myname(),gras_os_myport(),to_name,to_port,elapsed,bw/1024.0);
   }
   
   gras_socket_close(meas);
@@ -283,9 +293,9 @@ static int amok_bw_cb_sat_begin(gras_msg_cb_ctx_t ctx, void *payload){
       xbt_ex_free(e);
     }
   }
-  INFO3("Saturation comming from %s:%d stopped on %s",
+  INFO4("Saturation comming from %s:%d stopped on %s:%d",
        gras_socket_peer_name(from),gras_socket_peer_port(from),
-       gras_os_myname());
+       gras_os_myname(),gras_os_myport());
 
   gras_socket_close(meas);
   if (gras_if_RL()) /* On SG, accepted=master */