X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/76fd0d1cb81eb8ae046dd936025312e3d03288fb..487f1bbd1b94a8738f06e84815ad0eef6d5e7525:/src/gras/Msg/gras_msg_exchange.c

diff --git a/src/gras/Msg/gras_msg_exchange.c b/src/gras/Msg/gras_msg_exchange.c
index 9130c54aa9..e1577320ac 100644
--- a/src/gras/Msg/gras_msg_exchange.c
+++ b/src/gras/Msg/gras_msg_exchange.c
@@ -46,10 +46,10 @@ gras_msg_wait_ext_(double timeout,
       (gras_msg_procdata_t) gras_libdata_by_id(gras_msg_libdata_id);
   unsigned int cpt;
 
-  xbt_assert0(msg_got, "msg_got is an output parameter");
+  xbt_assert(msg_got, "msg_got is an output parameter");
 
   start = gras_os_time();
-  VERB2("Waiting for message '%s' for %fs",
+  XBT_VERB("Waiting for message '%s' for %fs",
         msgt_want ? msgt_want->name : "(any)", timeout);
 
   xbt_dynar_foreach(pd->msg_waitqueue, cpt, msg) {
@@ -60,7 +60,7 @@ gras_msg_wait_ext_(double timeout,
 
       memcpy(msg_got, &msg, sizeof(s_gras_msg_t));
       xbt_dynar_cursor_rm(pd->msg_waitqueue, &cpt);
-      VERB0("The waited message was queued");
+      XBT_VERB("The waited message was queued");
       return;
     }
   }
@@ -73,7 +73,7 @@ gras_msg_wait_ext_(double timeout,
 
       memcpy(msg_got, &msg, sizeof(s_gras_msg_t));
       xbt_dynar_cursor_rm(pd->msg_queue, &cpt);
-      VERB0("The waited message was queued");
+      XBT_VERB("The waited message was queued");
       return;
     }
   }
@@ -104,7 +104,7 @@ gras_msg_wait_ext_(double timeout,
     if (need_restart)
       goto restart_receive;
 
-    DEBUG0("Got a message from the socket");
+    XBT_DEBUG("Got a message from the socket");
 
     if ((!msgt_want || (msg.type->code == msgt_want->code))
         && (!expe_want || (!strcmp(gras_socket_peer_name(msg.expe),
@@ -112,17 +112,17 @@ gras_msg_wait_ext_(double timeout,
         && (!filter || filter(&msg, filter_ctx))) {
 
       memcpy(msg_got, &msg, sizeof(s_gras_msg_t));
-      DEBUG0("Message matches expectations. Use it.");
+      XBT_DEBUG("Message matches expectations. Use it.");
       return;
     }
-    DEBUG0("Message does not match expectations. Queue it.");
+    XBT_DEBUG("Message does not match expectations. Queue it.");
 
     /* not expected msg type. Queue it for later */
     xbt_dynar_push(pd->msg_queue, &msg);
 
     now = gras_os_time();
     if (now - start + 0.001 > timeout) {
-      THROW1(timeout_error, now - start + 0.001 - timeout,
+      THROWF(timeout_error, now - start + 0.001 - timeout,
              "Timeout while waiting for msg '%s'",
              msgt_want ? msgt_want->name : "(any)");
     }
@@ -152,11 +152,11 @@ gras_msg_wait_(double timeout,
   gras_msg_wait_ext_(timeout, msgt_want, NULL, NULL, NULL, &msg);
 
   if (msgt_want->ctn_type) {
-    xbt_assert1(payload,
+    xbt_assert(payload,
                 "Message type '%s' convey a payload that you must accept",
                 msgt_want->name);
   } else {
-    xbt_assert1(!payload,
+    xbt_assert(!payload,
                 "No payload was declared for message type '%s' (don't expect one)",
                 msgt_want->name);
   }
@@ -175,9 +175,9 @@ static int gras_msg_wait_or_filter(gras_msg_t msg, void *ctx)
   xbt_dynar_t dyn = (xbt_dynar_t) ctx;
   int res = xbt_dynar_member(dyn, msg->type);
   if (res)
-    VERB1("Got matching message (type=%s)", msg->type->name);
+    XBT_VERB("Got matching message (type=%s)", msg->type->name);
   else
-    VERB0("Got message not matching our expectations");
+    XBT_VERB("Got message not matching our expectations");
   return res;
 }
 
@@ -203,13 +203,13 @@ void gras_msg_wait_or(double timeout,
 {
   s_gras_msg_t msg;
 
-  VERB1("Wait %f seconds for several message types", timeout);
+  XBT_VERB("Wait %f seconds for several message types", timeout);
   gras_msg_wait_ext_(timeout,
                      NULL, NULL,
                      &gras_msg_wait_or_filter, (void *) msgt_want, &msg);
 
   if (msg.type->ctn_type) {
-    xbt_assert1(payload,
+    xbt_assert(payload,
                 "Message type '%s' convey a payload you must accept",
                 msg.type->name);
   }
@@ -235,19 +235,19 @@ void gras_msg_send_(gras_socket_t sock, gras_msgtype_t msgtype,
 {
 
   if (msgtype->ctn_type) {
-    xbt_assert1(payload,
+    xbt_assert(payload,
                 "Message type '%s' convey a payload you must provide",
                 msgtype->name);
   } else {
-    xbt_assert1(!payload,
+    xbt_assert(!payload,
                 "No payload was declared for message type '%s'",
                 msgtype->name);
   }
 
-  DEBUG2("Send a oneway message of type '%s'. Payload=%p",
+  XBT_DEBUG("Send a oneway message of type '%s'. Payload=%p",
          msgtype->name, payload);
   gras_msg_send_ext(sock, e_gras_msg_kind_oneway, 0, msgtype, payload);
-  VERB2("Sent a oneway message of type '%s'. Payload=%p",
+  XBT_VERB("Sent a oneway message of type '%s'. Payload=%p",
         msgtype->name, payload);
 }
 
@@ -274,7 +274,7 @@ void gras_msg_handleall(double period)
     }
     CATCH(e) {
       if (e.category != timeout_error)
-        RETHROW0("Error while waiting for messages: %s");
+        RETHROWF("Error while waiting for messages: %s");
       xbt_ex_free(e);
     }
     /* Epsilon to avoid numerical stability issues were the waited interval is so small that the global clock cannot notice the increment */
@@ -309,10 +309,10 @@ void gras_msg_handle(double timeOut)
   int timerexpected, timeouted;
   xbt_ex_t e;
 
-  VERB1("Handling message within the next %.2fs", timeOut);
+  XBT_VERB("Handling message within the next %.2fs", timeOut);
 
   untiltimer = gras_msg_timer_handle();
-  DEBUG1("Next timer in %f sec", untiltimer);
+  XBT_DEBUG("Next timer in %f sec", untiltimer);
   if (untiltimer == 0.0) {
     /* A timer was already elapsed and handled */
     return;
@@ -327,7 +327,7 @@ void gras_msg_handle(double timeOut)
   /* get a message (from the queue or from the net) */
   timeouted = 0;
   if (xbt_dynar_length(pd->msg_queue)) {
-    DEBUG0("Get a message from the queue");
+    XBT_DEBUG("Get a message from the queue");
     xbt_dynar_shift(pd->msg_queue, &msg);
   } else {
     TRY {
@@ -337,7 +337,7 @@ void gras_msg_handle(double timeOut)
     CATCH(e) {
       if (e.category != timeout_error)
         RETHROW;
-      DEBUG0("Damn. Timeout while getting a message from the queue");
+      XBT_DEBUG("Damn. Timeout while getting a message from the queue");
       xbt_ex_free(e);
       timeouted = 1;
     }
@@ -352,19 +352,19 @@ void gras_msg_handle(double timeOut)
         /* we served a timer, we're done */
         return;
       } else {
-        xbt_assert1(untiltimer > 0, "Negative timer (%f). I'm 'puzzeled'",
+        xbt_assert(untiltimer > 0, "Negative timer (%f). I'm 'puzzeled'",
                     untiltimer);
-        WARN1
+        XBT_WARN
             ("No timer elapsed, in contrary to expectations (next in %f sec)",
              untiltimer);
-        THROW1(timeout_error, 0,
+        THROWF(timeout_error, 0,
                "No timer elapsed, in contrary to expectations (next in %f sec)",
                untiltimer);
       }
 
     } else {
       /* select timeouted, and no timer elapsed. Nothing to do */
-      THROW1(timeout_error, 0, "No new message or timer (delay was %f)",
+      THROWF(timeout_error, 0, "No new message or timer (delay was %f)",
              timeOut);
     }
 
@@ -379,7 +379,7 @@ void gras_msg_handle(double timeOut)
     }
   }
   if (!list) {
-    INFO4
+    XBT_INFO
         ("No callback for message '%s' (type:%s) from %s:%d. Queue it for later gras_msg_wait() use.",
          msg.type->name, e_gras_msg_kind_names[msg.kind],
          gras_socket_peer_name(msg.expe), gras_socket_peer_port(msg.expe));
@@ -399,7 +399,7 @@ void gras_msg_handle(double timeOut)
     TRY {
       xbt_dynar_foreach(list->cbs, cpt, cb) {
         if (!ran_ok) {
-          DEBUG4
+          XBT_DEBUG
               ("Use the callback #%d (@%p) for incomming msg '%s' (payload_size=%d)",
                cpt + 1, cb, msg.type->name, msg.payl_size);
           if (!(*cb) (&ctx, msg.payl)) {
@@ -424,7 +424,7 @@ void gras_msg_handle(double timeOut)
           e.host = (char *) gras_os_myname();
           xbt_ex_setup_backtrace(&e);
         }
-        INFO5
+        XBT_INFO
             ("Propagate %s exception ('%s') from '%s' RPC cb back to %s:%d",
              (e.remote ? "remote" : "local"), e.msg, msg.type->name,
              gras_socket_peer_name(msg.expe),
@@ -438,22 +438,22 @@ void gras_msg_handle(double timeOut)
         ctx.answer_due = 0;
         ran_ok = 1;
       } else {
-        RETHROW4
+        RETHROWF
             ("Callback #%d (@%p) to message '%s' (payload size: %d) raised an exception: %s",
              cpt + 1, cb, msg.type->name, msg.payl_size);
       }
     }
 
-    xbt_assert1(!ctx.answer_due,
+    xbt_assert(!ctx.answer_due,
                 "Bug in user code: RPC callback to message '%s' didn't call gras_msg_rpcreturn",
                 msg.type->name);
     if (ctx.answer_due)
-      CRITICAL1
+      XBT_CRITICAL
           ("BUGS BOTH IN USER CODE (RPC callback to message '%s' didn't call gras_msg_rpcreturn) "
            "AND IN SIMGRID (process wasn't killed by an assert)",
            msg.type->name);
     if (!ran_ok)
-      THROW1(mismatch_error, 0,
+      THROWF(mismatch_error, 0,
              "Message '%s' refused by all registered callbacks (maybe your callback misses a 'return 0' at the end)",
              msg.type->name);
     /* FIXME: gras_datadesc_free not implemented => leaking the payload */
@@ -461,23 +461,23 @@ void gras_msg_handle(double timeOut)
 
 
   case e_gras_msg_kind_rpcanswer:
-    INFO3("Unexpected RPC answer discarded (type: %s; from:%s:%d)",
+    XBT_INFO("Unexpected RPC answer discarded (type: %s; from:%s:%d)",
           msg.type->name, gras_socket_peer_name(msg.expe),
           gras_socket_peer_port(msg.expe));
-    WARN0
+    XBT_WARN
         ("FIXME: gras_datadesc_free not implemented => leaking the payload");
     return;
 
   case e_gras_msg_kind_rpcerror:
-    INFO3("Unexpected RPC error discarded (type: %s; from:%s:%d)",
+    XBT_INFO("Unexpected RPC error discarded (type: %s; from:%s:%d)",
           msg.type->name, gras_socket_peer_name(msg.expe),
           gras_socket_peer_port(msg.expe));
-    WARN0
+    XBT_WARN
         ("FIXME: gras_datadesc_free not implemented => leaking the payload");
     return;
 
   default:
-    THROW1(unknown_error, 0,
+    THROWF(unknown_error, 0,
            "Cannot handle messages of kind %d yet", msg.type->kind);
   }