s/TRY/TRYOLD/ I'd like to introduce a TRY macro in the exception mecanism, but this...

[simgrid.git] / src / gras / Msg / msg.c

diff --git a/src/gras/Msg/msg.c b/src/gras/Msg/msg.c
index 50f3c77..c37b634 100644 (file)
--- a/src/gras/Msg/msg.c
+++ b/src/gras/Msg/msg.c
@@ -216,11 +216,12 @@ gras_msg_send(gras_socket_t   sock,
 
   DEBUG3("send '%s' to %s:%d", msgtype->name, 
         gras_socket_peer_name(sock),gras_socket_peer_port(sock));
-  TRY(gras_trp_chunk_send(sock, GRAS_header, 6));
+  TRYOLD(gras_trp_chunk_send(sock, GRAS_header, 6));
 
-  TRY(gras_datadesc_send(sock, string_type,   &msgtype->name));
-  TRY(gras_datadesc_send(sock, msgtype->ctn_type, payload));
-  TRY(gras_trp_flush(sock));
+  TRYOLD(gras_datadesc_send(sock, string_type,   &msgtype->name));
+  if (msgtype->ctn_type)
+    TRYOLD(gras_datadesc_send(sock, msgtype->ctn_type, payload));
+  TRYOLD(gras_trp_flush(sock));
 
   return no_error;
 }
@@ -240,12 +241,17 @@ gras_msg_recv(gras_socket_t    sock,
   int r_arch;
   char *msg_name=NULL;
 
+  xbt_assert1(!gras_socket_is_meas(sock), 
+             "Asked to receive a message on the measurement socket %p", sock);
   if (!string_type) {
     string_type=gras_datadesc_by_name("string");
     xbt_assert(string_type);
   }
   
-  TRY(gras_trp_chunk_recv(sock, header, 6));
+  errcode=gras_trp_chunk_recv(sock, header, 6);
+  if (errcode!=no_error)
+    RAISE2(errcode,"Got '%s' while trying to get the mesage header on socket %p",
+          xbt_error_name(errcode),sock);
   for (cpt=0; cpt<4; cpt++)
     if (header[cpt] != GRAS_header[cpt])
       RAISE2(mismatch_error,"Incoming bytes do not look like a GRAS message (header='%.4s' not '%.4s')",header,GRAS_header);
@@ -256,7 +262,7 @@ gras_msg_recv(gras_socket_t    sock,
   DEBUG2("Handle an incoming message using protocol %d (remote is %s)",
         (int)header[4],gras_datadesc_arch_name(r_arch));
 
-  TRY(gras_datadesc_recv(sock, string_type, r_arch, &msg_name));
+  TRYOLD(gras_datadesc_recv(sock, string_type, r_arch, &msg_name));
   errcode = xbt_set_get_by_name(_gras_msgtype_set,
                                 msg_name,(xbt_set_elm_t*)msgtype);
   if (errcode != no_error)
@@ -266,14 +272,18 @@ gras_msg_recv(gras_socket_t    sock,
   /* FIXME: Survive unknown messages */
   free(msg_name);
 
-  *payload_size=gras_datadesc_size((*msgtype)->ctn_type);
-  xbt_assert2(*payload_size > 0,
-              "%s %s",
-              "Dynamic array as payload is forbided for now (FIXME?).",
-              "Reference to dynamic array is allowed.");
-  *payload = xbt_malloc(*payload_size);
-  TRY(gras_datadesc_recv(sock, (*msgtype)->ctn_type, r_arch, *payload));
-
+  if ((*msgtype)->ctn_type) {
+    *payload_size=gras_datadesc_size((*msgtype)->ctn_type);
+    xbt_assert2(*payload_size > 0,
+               "%s %s",
+               "Dynamic array as payload is forbided for now (FIXME?).",
+               "Reference to dynamic array is allowed.");
+    *payload = xbt_malloc(*payload_size);
+    TRYOLD(gras_datadesc_recv(sock, (*msgtype)->ctn_type, r_arch, *payload));
+  } else {
+    *payload = NULL;
+    *payload_size = 0;
+  }
   return no_error;
 }
 
@@ -327,8 +337,8 @@ gras_msg_wait(double           timeout,
   }
 
   while (1) {
-    TRY(gras_trp_select(timeout - now + start, &expeditor_res));
-    TRY(gras_msg_recv(expeditor_res, &msgt_got, &payload_got, &payload_size_got));
+    TRYOLD(gras_trp_select(timeout - now + start, &expeditor_res));
+    TRYOLD(gras_msg_recv(expeditor_res, &msgt_got, &payload_got, &payload_size_got));
     if (msgt_got->code == msgt_want->code) {
       if (expeditor)
        *expeditor=expeditor_res;
@@ -408,8 +418,12 @@ gras_msg_handle(double timeOut) {
     errcode = gras_trp_select(timeOut, &expeditor);
     if (errcode != no_error && errcode != timeout_error)
        return errcode;
-    if (errcode != timeout_error)
-       TRY(gras_msg_recv(expeditor, &msgtype, &payload, &payload_size));
+    if (errcode == no_error) {
+       errcode = gras_msg_recv(expeditor, &msgtype, &payload, &payload_size);
+       if (errcode != no_error) 
+         RAISE2(errcode, "Error '%s' while receiving a message on select()ed socket %p",
+                xbt_error_name(errcode),expeditor);
+    }
   }
 
   if (errcode == timeout_error ) {
@@ -421,7 +435,7 @@ gras_msg_handle(double timeOut) {
           return no_error;
        } else {
           xbt_assert1(untiltimer>0, "Negative timer (%f). I'm puzzeled", untiltimer);
-          ERROR1("No timer elapsed, in contrary to expectations (next in %f sec)",
+          WARN1("No timer elapsed, in contrary to expectations (next in %f sec)",
                  untiltimer);
           return timeout_error;
        }