Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Less verbosity
[simgrid.git] / src / amok / Bandwidth / saturate.c
index c962c59..795d48a 100644 (file)
@@ -71,10 +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);
+  VERB4("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;
@@ -83,14 +83,8 @@ void amok_bw_saturate_start(const char* from_name,unsigned int from_port,
   request->duration=duration;
   request->msg_size=msg_size;
 
- TRY{
   gras_msg_rpccall(sock,60,gras_msgtype_by_name("amok_bw_sat start"),&request, NULL);
 
-  }CATCH(e){
-    if (e.value==1)
-      THROW1(0,1,"%s",to_name);
-    THROW1(0,0,"%s",from_name);
-  }
   free(request);
   gras_socket_close(sock);
 }
@@ -100,23 +94,16 @@ 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);
 
-TRY{
   amok_bw_saturate_begin(request->peer.name,request->peer.port,
 
                         request->msg_size, request->duration,
                         NULL,NULL);
-
-  }CATCH(e){
-     THROW1(0,1," can not connect %s ",((request)->peer.name));
-  }
  
   free(request->peer.name);