Better fix to the comparison between signed and unsigned int around dynar size: chang...

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

diff --git a/src/amok/Bandwidth/bandwidth.c b/src/amok/Bandwidth/bandwidth.c
index f816c41..f8ea7b7 100644 (file)
--- a/src/amok/Bandwidth/bandwidth.c
+++ b/src/amok/Bandwidth/bandwidth.c
@@ -86,16 +86,12 @@ void amok_bw_bw_init() {
   gras_msgtype_declare_rpc("BW request",  bw_request_desc,bw_res_desc);
 }
 void amok_bw_bw_join() {
-  gras_cb_register(gras_msgtype_by_name("BW request"),
-                  &amok_bw_cb_bw_request);
-  gras_cb_register(gras_msgtype_by_name("BW handshake"),
-                  &amok_bw_cb_bw_handshake);
+  gras_cb_register("BW request",  &amok_bw_cb_bw_request);
+  gras_cb_register("BW handshake",&amok_bw_cb_bw_handshake);
 }
 void amok_bw_bw_leave() {
-  gras_cb_unregister(gras_msgtype_by_name("BW request"),
-                    &amok_bw_cb_bw_request);
-  gras_cb_unregister(gras_msgtype_by_name("BW handshake"),
-                    &amok_bw_cb_bw_handshake);
+  gras_cb_unregister("BW request",  &amok_bw_cb_bw_request);
+  gras_cb_unregister("BW handshake",&amok_bw_cb_bw_handshake);
 }
 
 /**
@@ -167,8 +163,7 @@ void amok_bw_test(gras_socket_t peer,
        request->buf_size,request->msg_size,request->msg_amount);
 
   TRY {
-    gras_msg_rpccall(peer,15,
-                    gras_msgtype_by_name("BW handshake"),&request, &request_ack);
+    gras_msg_rpccall(peer,15,"BW handshake",&request, &request_ack);
   } CATCH(e) {
     RETHROW0("Error encountered while sending the BW request: %s");
   }
@@ -221,7 +216,7 @@ void amok_bw_test(gras_socket_t peer,
            request->msg_size, request->msg_amount,
            ((double)request->msg_size) * ((double)request->msg_amount / (*sec) /1024.0/1024.0));
 
-      gras_msg_rpccall(peer, 60, gras_msgtype_by_name("BW reask"),&request, NULL);      
+      gras_msg_rpccall(peer, 60, "BW reask",&request, NULL);      
     }
 
     first_pass = 0;
@@ -249,7 +244,7 @@ void amok_bw_test(gras_socket_t peer,
 
   DEBUG2("This measurement was long enough (%f sec; found %f b/s). Stop peer",
         *sec,*bw);
-  gras_msg_send(peer, gras_msgtype_by_name("BW stop"), NULL);      
+  gras_msg_send(peer, "BW stop", NULL);      
 
   free(request_ack);
   free(request);
@@ -378,7 +373,7 @@ int amok_bw_cb_bw_handshake(gras_msg_cb_ctx_t  ctx,
   free(answer);
   free(request);
   VERB0("BW experiment done.");
-  return 1;
+  return 0;
 }
 
 /**
@@ -434,7 +429,7 @@ void amok_bw_request(const char* from_name,unsigned int from_port,
     
  
   DEBUG4("Ask for a BW test between %s:%d and %s:%d",  from_name,from_port, to_name,to_port);
-  gras_msg_rpccall(sock,20*60,gras_msgtype_by_name("BW request"), &request, &result);
+  gras_msg_rpccall(sock,20*60,"BW request", &request, &result);
 
   if (sec)
     *sec=result->sec;
@@ -478,7 +473,7 @@ int amok_bw_cb_bw_request(gras_msg_cb_ctx_t ctx,
   free(request);
   free(result);
   
-  return 1;
+  return 0;
 }
 
 /** \brief builds a matrix of results of bandwidth measurement
@@ -495,7 +490,8 @@ double * amok_bw_matrix(xbt_dynar_t peers,
   /* construction of matrices for bandwith and latency */
 
 
-  int i,j,len=xbt_dynar_length(peers);
+  unsigned int i,j;
+  int len=xbt_dynar_length(peers);
 
   double *matrix_res = xbt_new0(double, len*len);
   xbt_peer_t p1,p2;