please close the structure behind you

[simgrid.git] / src / gras / DataDesc / ddt_exchange.c

diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c
index 3727964..c90975c 100644 (file)
--- a/src/gras/DataDesc/ddt_exchange.c
+++ b/src/gras/DataDesc/ddt_exchange.c
@@ -10,7 +10,7 @@
 
 #include "DataDesc/datadesc_private.h"
 
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(exchange,DataDesc);
+GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(exchange,datadesc);
 
 const char *gras_datadesc_cat_names[9] = { 
   "undefined", 
@@ -70,12 +70,12 @@ gras_dd_recv_int(gras_socket_t *sock, int r_arch, int *i) {
 
   if (int_type->size[GRAS_THISARCH] >= int_type->size[r_arch]) {
     TRY(gras_trp_chunk_recv(sock, (char*)i, int_type->size[r_arch]));
-    TRY(gras_dd_convert_elm(int_type,r_arch, i,i));
+    TRY(gras_dd_convert_elm(int_type,1,r_arch, i,i));
   } else {
     void *ptr = NULL;
     ptr = malloc((size_t)int_type->size[r_arch]);
     TRY(gras_trp_chunk_recv(sock, (char*)ptr, int_type->size[r_arch]));
-    TRY(gras_dd_convert_elm(int_type,r_arch, ptr,i));
+    TRY(gras_dd_convert_elm(int_type,1,r_arch, ptr,i));
     free(ptr);
   }
   DEBUG1("recv_int(%d)",*i);
@@ -330,18 +330,26 @@ gras_datadesc_send_rec(gras_socket_t        *sock,
     gras_dd_cat_struct_t  struct_data;
     gras_dd_cat_field_t  *field;
     char                 *field_data;
-
+    
     struct_data = type->category.struct_data;
+    gras_assert1(struct_data.closed,
+      "Please call gras_datadesc_declare_struct_close on %s before sending it",
+               type->name);
     VERB1(">> Send all fields of the structure %s",type->name);
     gras_dynar_foreach(struct_data.fields, cpt, field) {
       field_data = data;
       field_data += field->offset[GRAS_THISARCH];
       
-      TRY(gras_datadesc_by_id(field->code, &sub_type));
+      errcode=gras_datadesc_by_id(field->code, &sub_type);
+      if (errcode != no_error) 
+       RAISE4(errcode,
+              "Got %s while searching for the sub type %d, #%d of %s",
+              gras_error_name(errcode),field->code,cpt,type->name);
       
       if (field->pre)
        field->pre(state,sub_type,field_data);
       
+      VERB1("Send field %s",field->name);
       TRY(gras_datadesc_send_rec(sock,state,refs,sub_type, field_data));
       
       if (field->post)
@@ -359,6 +367,9 @@ gras_datadesc_send_rec(gras_socket_t        *sock,
     
     union_data = type->category.union_data;
     
+    gras_assert1(union_data.closed,
+               "Please call gras_datadesc_declare_union_close on %s before sending it",
+               type->name);
     /* retrieve the field number */
     field_num = union_data.selector(state, type, data);
     
@@ -454,9 +465,15 @@ gras_datadesc_send_rec(gras_socket_t        *sock,
     /* send the content */
     TRY(gras_datadesc_by_id(array_data.code, &sub_type));
     elm_size = sub_type->aligned_size[GRAS_THISARCH];
-    for (cpt=0; cpt<count; cpt++) {
-      TRY(gras_datadesc_send_rec(sock,state,refs, sub_type, ptr));
-      ptr += elm_size;
+    if (sub_type->category_code == e_gras_datadesc_type_cat_scalar) {
+      VERB1("Array of %d scalars, send it in one shoot",count);
+      TRY(gras_trp_chunk_send(sock, data, 
+                             sub_type->aligned_size[GRAS_THISARCH] * count));
+    } else {
+      for (cpt=0; cpt<count; cpt++) {
+       TRY(gras_datadesc_send_rec(sock,state,refs, sub_type, ptr));
+       ptr += elm_size;
+      }
     }
     break;
   }
@@ -529,14 +546,14 @@ gras_datadesc_recv_rec(gras_socket_t        *sock,
 
   switch (type->category_code) {
   case e_gras_datadesc_type_cat_scalar:
-    if (type->size[GRAS_THISARCH] >= type->size[r_arch]) {
+    if (type->size[GRAS_THISARCH] == type->size[r_arch]) {
       TRY(gras_trp_chunk_recv(sock, (char*)l_data, type->size[r_arch]));
-      TRY(gras_dd_convert_elm(type,r_arch, l_data,l_data));
+      TRY(gras_dd_convert_elm(type,1,r_arch, l_data,l_data));
     } else {
       void *ptr = NULL;
       ptr = malloc((size_t)type->size[r_arch]);
       TRY(gras_trp_chunk_recv(sock, (char*)ptr, type->size[r_arch]));
-      TRY(gras_dd_convert_elm(type,r_arch, ptr,l_data));
+      TRY(gras_dd_convert_elm(type,1,r_arch, ptr,l_data));
       free(ptr);
     }
     break;
@@ -547,6 +564,9 @@ gras_datadesc_recv_rec(gras_socket_t        *sock,
 
     struct_data = type->category.struct_data;
 
+    gras_assert1(struct_data.closed,
+               "Please call gras_datadesc_declare_struct_close on %s before receiving it",
+               type->name);
     VERB1(">> Receive all fields of the structure %s",type->name);
     gras_dynar_foreach(struct_data.fields, cpt, field) {
       char                 *field_data = l_data + field->offset[GRAS_THISARCH];
@@ -569,6 +589,9 @@ gras_datadesc_recv_rec(gras_socket_t        *sock,
 
     union_data = type->category.union_data;
 
+    gras_assert1(union_data.closed,
+               "Please call gras_datadesc_declare_union_close on %s before receiving it",
+               type->name);
     /* retrieve the field number */
     TRY(gras_dd_recv_int(sock, r_arch, &field_num));
     if (field_num < 0)
@@ -688,7 +711,7 @@ gras_datadesc_recv_rec(gras_socket_t        *sock,
     count = array_data.fixed_size;
     if (count <= 0)
       count = subsize;
-    if (count <= 0)
+    if (count < 0)
       TRY(gras_dd_recv_int(sock, r_arch, &count));
     if (count < 0)
       RAISE1(mismatch_error,
@@ -696,14 +719,31 @@ gras_datadesc_recv_rec(gras_socket_t        *sock,
 
     /* receive the content */
     TRY(gras_datadesc_by_id(array_data.code, &sub_type));
-    elm_size = sub_type->aligned_size[GRAS_THISARCH];
-    VERB2("Receive a %d-long array of %s",count, sub_type->name);
-
-    ptr = l_data;
-    for (cpt=0; cpt<count; cpt++) {
-      TRY(gras_datadesc_recv_rec(sock,state,refs, sub_type,
-                                r_arch, NULL, 0, ptr,-1));
-      ptr += elm_size;
+    if (sub_type->category_code == e_gras_datadesc_type_cat_scalar) {
+      VERB1("Array of %d scalars, get it in one shoot", count);
+      if (sub_type->aligned_size[GRAS_THISARCH] >= 
+         sub_type->aligned_size[r_arch]) {
+       TRY(gras_trp_chunk_recv(sock, (char*)l_data, 
+                               sub_type->aligned_size[r_arch] * count));
+       TRY(gras_dd_convert_elm(sub_type,count,r_arch, l_data,l_data));
+      } else {
+       ptr = malloc((size_t)sub_type->aligned_size[r_arch] * count);
+       TRY(gras_trp_chunk_recv(sock, (char*)ptr, 
+                               sub_type->size[r_arch] * count));
+       TRY(gras_dd_convert_elm(sub_type,count,r_arch, ptr,l_data));
+       free(ptr);
+      }
+    } else {
+      /* not scalar content, get it recursively (may contain pointers) */
+      elm_size = sub_type->aligned_size[GRAS_THISARCH];
+      VERB2("Receive a %d-long array of %s",count, sub_type->name);
+
+      ptr = l_data;
+      for (cpt=0; cpt<count; cpt++) {
+       TRY(gras_datadesc_recv_rec(sock,state,refs, sub_type,
+                                  r_arch, NULL, 0, ptr,-1));
+       ptr += elm_size;
+      }
     }
     break;
   }