X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb3be59d63b0d199fa3f32b5a22553e44cfb917a..71c9241aa27344f9f8f02f3c1272af4556691713:/src/amok/Bandwidth/bandwidth.c?ds=sidebyside

diff --git a/src/amok/Bandwidth/bandwidth.c b/src/amok/Bandwidth/bandwidth.c
index 6e917ced0c..05ebc4ede4 100644
--- a/src/amok/Bandwidth/bandwidth.c
+++ b/src/amok/Bandwidth/bandwidth.c
@@ -293,8 +293,8 @@ int amok_bw_cb_bw_handshake(gras_msg_cb_ctx_t ctx, void *payload)
   volatile bw_request_t request = *(bw_request_t *) payload;
   bw_request_t answer;
   xbt_ex_t e;
-  int port;
-  int tooshort = 1;
+  volatile int port;
+  volatile int tooshort = 1;
   gras_msg_cb_ctx_t ctx_reask;
   static xbt_dynar_t msgtwaited = NULL;
 
@@ -371,7 +371,7 @@ int amok_bw_cb_bw_handshake(gras_msg_cb_ctx_t ctx, void *payload)
   }
 
   while (tooshort) {
-    void *payload;
+    void *payloadgot;
     int msggot;
     TRY {
       xbt_socket_meas_recv(measIn, 120, request->msg_size,
@@ -385,7 +385,7 @@ int amok_bw_cb_bw_handshake(gras_msg_cb_ctx_t ctx, void *payload)
       /* FIXME: tell error to remote ? */
       RETHROWF("Error encountered while receiving the experiment: %s");
     }
-    gras_msg_wait_or(60, msgtwaited, &ctx_reask, &msggot, &payload);
+    gras_msg_wait_or(60, msgtwaited, &ctx_reask, &msggot, &payloadgot);
     switch (msggot) {
     case 0:                    /* BW stop */
       tooshort = 0;
@@ -393,7 +393,7 @@ int amok_bw_cb_bw_handshake(gras_msg_cb_ctx_t ctx, void *payload)
     case 1:                    /* BW reask */
       tooshort = 1;
       free(request);
-      request = (bw_request_t) payload;
+      request = (bw_request_t) payloadgot;
       XBT_VERB("Return the reasking RPC");
       gras_msg_rpcreturn(60, ctx_reask, NULL);
     }