Added round trip time contraint to the SDP program, this parameter

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

diff --git a/src/gras/Msg/rl_msg.c b/src/gras/Msg/rl_msg.c
index c4f1be2..a4c4e16 100644 (file)
--- a/src/gras/Msg/rl_msg.c
+++ b/src/gras/Msg/rl_msg.c
@@ -26,9 +26,7 @@ void gras_msg_send_ext(gras_socket_t   sock,
   static gras_datadesc_type_t ulong_type=NULL;
   char c_kind=(char)kind;
   
-  if (!msgtype)
-    THROW0(arg_error,0,
-          "Cannot send the NULL message (did msgtype_by_name fail?)");
+  xbt_assert0(msgtype,"Cannot send the NULL message");
 
   if (!string_type) {
     string_type = gras_datadesc_by_name("string");
@@ -61,7 +59,10 @@ void gras_msg_send_ext(gras_socket_t   sock,
   if (kind == e_gras_msg_kind_rpcerror) {
      /* error on remote host, carfull, payload is an exception */
     gras_datadesc_send(sock, gras_datadesc_by_name("ex_t"),payload);
-  } else {
+  } else if (kind == e_gras_msg_kind_rpcanswer) {
+    if (msgtype->answer_type)
+      gras_datadesc_send(sock, msgtype->answer_type, payload);
+  }else {
      /* regular message */
      if (msgtype->ctn_type)
        gras_datadesc_send(sock, msgtype->ctn_type, payload);
@@ -103,14 +104,14 @@ gras_msg_recv(gras_socket_t    sock,
     gras_trp_recv(sock, &c_kind, 1);
     msg->kind=(e_gras_msg_kind_t)c_kind;
   } CATCH(e) {
-    RETHROW1("Exception caught while trying to get the mesage header on socket %p: %s",
-            sock);
+    RETHROW0("Exception caught while trying to get the mesage header: %s");
   }
 
   for (cpt=0; cpt<4; cpt++)
     if (header[cpt] != _GRAS_header[cpt])
       THROW2(mismatch_error,0,
-            "Incoming bytes do not look like a GRAS message (header='%.4s' not '%.4s')",header,_GRAS_header);
+            "Incoming bytes do not look like a GRAS message (header='%.4s' not '%.4s')",
+            header,_GRAS_header);
   if (header[4] != _GRAS_header[4]) 
     THROW2(mismatch_error,0,"GRAS protocol mismatch (got %d, use %d)",
           (int)header[4], (int)_GRAS_header[4]);
@@ -148,6 +149,20 @@ gras_msg_recv(gras_socket_t    sock,
     msg->payl=xbt_malloc(msg->payl_size);
     gras_datadesc_recv(sock, gras_datadesc_by_name("ex_t"), r_arch, msg->payl);
 
+  } else if  (msg->kind == e_gras_msg_kind_rpcanswer) {
+     /* answer to RPC */
+     if (msg->type->answer_type) {
+       msg->payl_size=gras_datadesc_size(msg->type->answer_type);
+       xbt_assert2(msg->payl_size > 0,
+                   "%s %s",
+                   "Dynamic array as payload is forbided for now (FIXME?).",
+                   "Reference to dynamic array is allowed.");
+       msg->payl = xbt_malloc(msg->payl_size);
+       gras_datadesc_recv(sock, msg->type->answer_type, r_arch, msg->payl);
+     } else {
+       msg->payl = NULL;
+       msg->payl_size = 0;
+     }
   } else {
      /* regular message */
      if (msg->type->ctn_type) {