Better fix to the comparison between signed and unsigned int around dynar size: chang...

[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 3f3015f..0ec2722 100644 (file)
--- a/src/gras/DataDesc/ddt_exchange.c
+++ b/src/gras/DataDesc/ddt_exchange.c
@@ -20,42 +20,42 @@ const char *gras_datadesc_cat_names[9] = {
   "scalar", "struct", "union", "ref", "array", "ignored",
   "invalid"};
 
-static gras_datadesc_type_t int_type = NULL;
+static gras_datadesc_type_t uint_type = NULL;
 static gras_datadesc_type_t pointer_type = NULL;    
 
 static XBT_INLINE void
-gras_dd_send_int(gras_socket_t sock,int *i, int stable) {
+gras_dd_send_uint(gras_socket_t sock,unsigned int *i, int stable) {
 
-  if (!int_type) {
-    int_type = gras_datadesc_by_name("int");
-     xbt_assert(int_type);  
+  if (!uint_type) {
+    uint_type = gras_datadesc_by_name("unsigned int");
+    xbt_assert(uint_type);  
   }
    
-  DEBUG1("send_int(%d)",*i);
-  gras_trp_send(sock, (char*)i, int_type->size[GRAS_THISARCH], stable);
+  DEBUG1("send_uint(%u)",*i);
+  gras_trp_send(sock, (char*)i, uint_type->size[GRAS_THISARCH], stable);
 }
 
 static XBT_INLINE void
-gras_dd_recv_int(gras_socket_t sock, int r_arch, int *i) {
+gras_dd_recv_uint(gras_socket_t sock, int r_arch, unsigned int *i) {
 
-  if (!int_type) {
-     int_type = gras_datadesc_by_name("int");
-     xbt_assert(int_type);
+  if (!uint_type) {
+     uint_type = gras_datadesc_by_name("unsigned int");
+     xbt_assert(uint_type);
   }
 
-  if (int_type->size[GRAS_THISARCH] >= int_type->size[r_arch]) {
-    gras_trp_recv(sock, (char*)i, int_type->size[r_arch]);
+  if (uint_type->size[GRAS_THISARCH] >= uint_type->size[r_arch]) {
+    gras_trp_recv(sock, (char*)i, uint_type->size[r_arch]);
     if (r_arch != GRAS_THISARCH)
-      gras_dd_convert_elm(int_type,1,r_arch, i,i);
+      gras_dd_convert_elm(uint_type,1,r_arch, i,i);
   } else {
-    void *ptr = xbt_malloc(int_type->size[r_arch]);
+    void *ptr = xbt_malloc(uint_type->size[r_arch]);
 
-    gras_trp_recv(sock, (char*)ptr, int_type->size[r_arch]);
+    gras_trp_recv(sock, (char*)ptr, uint_type->size[r_arch]);
     if (r_arch != GRAS_THISARCH)
-      gras_dd_convert_elm(int_type,1,r_arch, ptr,i);
+      gras_dd_convert_elm(uint_type,1,r_arch, ptr,i);
     free(ptr);
   }
-  DEBUG1("recv_int(%d)",*i);
+  DEBUG1("recv_uint(%u)",*i);
 }
 
 /*
@@ -115,7 +115,7 @@ gras_datadesc_memcpy_rec(gras_cbps_t           state,
 
 
   xbt_ex_t             e;
-  int                  cpt;
+  unsigned int         cpt;
   gras_datadesc_type_t sub_type; /* type on which we recurse */
   int count = 0;
 
@@ -184,7 +184,7 @@ gras_datadesc_memcpy_rec(gras_cbps_t           state,
   case e_gras_datadesc_type_cat_union: {
     gras_dd_cat_union_t union_data;
     gras_dd_cat_field_t field=NULL;
-    int                 field_num;
+    unsigned int        field_num;
     
     union_data = type->category.union_data;
     
@@ -198,7 +198,7 @@ gras_datadesc_memcpy_rec(gras_cbps_t           state,
                "union field selector of %s gave a negative value", 
                type->name);
     
-    xbt_assert3(field_num < (int)xbt_dynar_length(union_data.fields),
+    xbt_assert3(field_num < xbt_dynar_length(union_data.fields),
         "union field selector of %s returned %d but there is only %lu fields",
                 type->name, field_num, xbt_dynar_length(union_data.fields));
     
@@ -405,7 +405,7 @@ gras_datadesc_send_rec(gras_socket_t         sock,
                       int                   detect_cycle) {
 
   xbt_ex_t             e;
-  int                  cpt;
+  unsigned int         cpt;
   gras_datadesc_type_t sub_type; /* type on which we recurse */
   
   VERB2("Send a %s (%s)", 
@@ -458,7 +458,7 @@ gras_datadesc_send_rec(gras_socket_t         sock,
   case e_gras_datadesc_type_cat_union: {
     gras_dd_cat_union_t union_data;
     gras_dd_cat_field_t field=NULL;
-    int                 field_num;
+    unsigned int        field_num;
     
     union_data = type->category.union_data;
     
@@ -472,12 +472,12 @@ gras_datadesc_send_rec(gras_socket_t         sock,
                 "union field selector of %s gave a negative value", 
                 type->name);
     
-    xbt_assert3(field_num < (int)xbt_dynar_length(union_data.fields),
+    xbt_assert3(field_num < xbt_dynar_length(union_data.fields),
         "union field selector of %s returned %d but there is only %lu fields",
                 type->name, field_num, xbt_dynar_length(union_data.fields));
 
     /* Send the field number */
-    gras_dd_send_int(sock, &field_num, 0 /* not stable */);
+    gras_dd_send_uint(sock, &field_num, 0 /* not stable */);
     
     /* Send the content */
     field = xbt_dynar_get_as(union_data.fields, field_num, gras_dd_cat_field_t);
@@ -503,7 +503,7 @@ gras_datadesc_send_rec(gras_socket_t         sock,
     sub_type = ref_data.type;
     if (sub_type == NULL) {
       sub_type = (*ref_data.selector)(type,state,data);
-      gras_dd_send_int(sock, (int*) &(sub_type->code),1 /*stable*/);
+      gras_dd_send_uint(sock, &(sub_type->code),1 /*stable*/);
     }
     
     /* Send the actual value of the pointer for cycle handling */
@@ -551,7 +551,7 @@ gras_datadesc_send_rec(gras_socket_t         sock,
 
   case e_gras_datadesc_type_cat_array: {
     gras_dd_cat_array_t    array_data;
-    int                    count;
+    unsigned int           count;
     char                  *ptr=data;
     long int               elm_size;
     
@@ -563,7 +563,7 @@ gras_datadesc_send_rec(gras_socket_t         sock,
       count = array_data.dynamic_size(type,state,data);
       xbt_assert1(count >=0,
                   "Invalid (negative) array size for type %s",type->name);
-      gras_dd_send_int(sock, &count, 0/*non-stable*/);
+      gras_dd_send_uint(sock, &count, 0/*non-stable*/);
     }
     
     /* send the content */
@@ -654,7 +654,7 @@ gras_datadesc_recv_rec(gras_socket_t         sock,
                       int                   subsize,
                       int                   detect_cycle) {
 
-  int                  cpt;
+  unsigned int         cpt;
   gras_datadesc_type_t sub_type;
   xbt_ex_t e;
 
@@ -711,7 +711,7 @@ gras_datadesc_recv_rec(gras_socket_t         sock,
   case e_gras_datadesc_type_cat_union: {
     gras_dd_cat_union_t union_data;
     gras_dd_cat_field_t field=NULL;
-    int                 field_num;
+    unsigned int        field_num;
 
     union_data = type->category.union_data;
 
@@ -719,11 +719,11 @@ gras_datadesc_recv_rec(gras_socket_t         sock,
                "Please call gras_datadesc_declare_union_close on %s before receiving it",
                type->name);
     /* retrieve the field number */
-    gras_dd_recv_int(sock, r_arch, &field_num);
+    gras_dd_recv_uint(sock, r_arch, &field_num);
     if (field_num < 0)
       THROW1(mismatch_error,0,
             "Received union field for %s is negative", type->name);
-    if (field_num > (int)xbt_dynar_length(union_data.fields)) 
+    if (field_num > xbt_dynar_length(union_data.fields)) 
       THROW3(mismatch_error,0,
             "Received union field for %s is said to be #%d but there is only %lu fields",
             type->name, field_num, xbt_dynar_length(union_data.fields));
@@ -753,8 +753,8 @@ gras_datadesc_recv_rec(gras_socket_t         sock,
     /* Get the referenced type locally or from peer */
     sub_type = ref_data.type;
     if (sub_type == NULL) {
-      int ref_code;
-      gras_dd_recv_int(sock, r_arch, &ref_code);
+      unsigned int ref_code;
+      gras_dd_recv_uint(sock, r_arch, &ref_code);
       sub_type = gras_datadesc_by_id(ref_code);
     }
 
@@ -793,7 +793,7 @@ gras_datadesc_recv_rec(gras_socket_t         sock,
     }
 
     if (reference_is_to_recv) {
-      int subsubcount = 0;
+      unsigned int subsubcount = 0;
       void *l_referenced=NULL;
 
       VERB2("Receiving a ref to '%s', remotely @%p",
@@ -806,7 +806,7 @@ gras_datadesc_recv_rec(gras_socket_t         sock,
 
        subsubcount = array_data.fixed_size;
        if (subsubcount == 0)
-         gras_dd_recv_int(sock, r_arch, &subsubcount);
+         gras_dd_recv_uint(sock, r_arch, &subsubcount);
 
        subsub_type = array_data.type;
 
@@ -845,7 +845,7 @@ gras_datadesc_recv_rec(gras_socket_t         sock,
 
   case e_gras_datadesc_type_cat_array: {
     gras_dd_cat_array_t    array_data;
-    int       count;
+    unsigned int count;
     char     *ptr;
     long int  elm_size;
 
@@ -855,7 +855,7 @@ gras_datadesc_recv_rec(gras_socket_t         sock,
     if (count == 0)
       count = subsize;
     if (count == 0)
-      gras_dd_recv_int(sock, r_arch, &count);
+      gras_dd_recv_uint(sock, r_arch, &count);
     if (count == 0)
       THROW1(mismatch_error,0,
             "Invalid (=0) array size for type %s",type->name);