payload_size is used to memcpy the payload. Do not count the size of the pointed...

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

diff --git a/src/gras/Msg/sg_msg.c b/src/gras/Msg/sg_msg.c
index 94d57aa..6add5c1 100644 (file)
--- a/src/gras/Msg/sg_msg.c
+++ b/src/gras/Msg/sg_msg.c
@@ -9,7 +9,6 @@
 
 #include "xbt/ex.h"
 
-//#include "msg/msg.h"
 #include "gras/Virtu/virtu_sg.h"
 
 #include "gras/Msg/msg_private.h"
@@ -31,6 +30,8 @@ gras_msg_send(gras_socket_t   sock,
   m_task_t task=NULL;
   gras_trp_sg_sock_data_t *sock_data = (gras_trp_sg_sock_data_t *)sock->data;
   gras_msg_t msg;
+  int whole_payload_size=0; /* msg->payload_size is used to memcpy the payload. 
+                               This is used to report the load onto the simulator. It also counts the size of pointed stuff */
 
   xbt_assert1(!gras_socket_is_meas(sock), 
              "Asked to send a message on the measurement socket %p", sock);
@@ -38,9 +39,11 @@ gras_msg_send(gras_socket_t   sock,
   msg=xbt_new0(s_gras_msg_t,1);
   msg->type=msgtype;
 
+   
+  msg->payload_size=gras_datadesc_size(msgtype->ctn_type);
   msg->payload=xbt_malloc(gras_datadesc_size(msgtype->ctn_type));
   if (msgtype->ctn_type)
-    msg->payload_size=gras_datadesc_copy(msgtype->ctn_type,payload,msg->payload);
+    whole_payload_size = gras_datadesc_copy(msgtype->ctn_type,payload,msg->payload);
 
   task=MSG_task_create(msgtype->name,0,
                       ((double)msg->payload_size)/(1024.0*1024.0),msg);
@@ -59,9 +62,8 @@ gras_msg_recv(gras_socket_t    sock,
              int             *payload_size) {
 
   m_task_t task=NULL;
-  /*  gras_trp_sg_sock_data_t *sock_data = (gras_trp_sg_sock_data_t *)sock->data;*/
   gras_msg_t msg;
-  gras_trp_procdata_t pd=(gras_trp_procdata_t)gras_libdata_get("gras_trp");
+  gras_trp_procdata_t pd=(gras_trp_procdata_t)gras_libdata_by_name("gras_trp");
 
   xbt_assert1(!gras_socket_is_meas(sock), 
              "Asked to receive a message on the measurement socket %p", sock);
@@ -77,62 +79,4 @@ gras_msg_recv(gras_socket_t    sock,
   free(msg);
   if (MSG_task_destroy(task) != MSG_OK)
     THROW0(system_error,0,"Error in MSG_task_destroy()");
-
-
-  /*
-  THROW_UNIMPLEMENTED;
-
-  xbt_ex_t e;
-  static gras_datadesc_type_t string_type=NULL;
-  char header[6];
-  int cpt;
-  int r_arch;
-  char *msg_name=NULL;
-
-  if (!string_type) {
-    string_type=gras_datadesc_by_name("string");
-    xbt_assert(string_type);
-  }
-  
-  TRY {
-    gras_trp_chunk_recv(sock, header, 6);
-  } CATCH(e) {
-    RETHROW1("Exception caught while trying to get the mesage header on socket %p: %s",
-            sock);
-  }
-
-  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);
-  if (header[4] != _GRAS_header[4]) 
-    THROW2(mismatch_error,0,"GRAS protocol mismatch (got %d, use %d)",
-          (int)header[4], (int)_GRAS_header[4]);
-  r_arch = (int)header[5];
-  DEBUG2("Handle an incoming message using protocol %d (remote is %s)",
-        (int)header[4],gras_datadesc_arch_name(r_arch));
-
-  gras_datadesc_recv(sock, string_type, r_arch, &msg_name);
-  TRY {
-    *msgtype = (gras_msgtype_t)xbt_set_get_by_name(_gras_msgtype_set,msg_name);
-  } CATCH(e) {
-    / * FIXME: Survive unknown messages * /
-    RETHROW1("Exception caught while retrieving the type associated to messages '%s' : %s",
-            msg_name);
-  }
-  free(msg_name);
-
-  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);
-    gras_datadesc_recv(sock, (*msgtype)->ctn_type, r_arch, *payload);
-  } else {
-    *payload = NULL;
-    *payload_size = 0;
-  }
-*/
 }