Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Reindent everything (possibly breaking all branches, but for the last time)
[simgrid.git] / src / gras / DataDesc / datadesc.c
index 09ba9fc..b334488 100644 (file)
 
 #include "gras/DataDesc/datadesc_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_ddt,gras,"Data description");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_ddt, gras, "Data description");
 /* FIXME: make this host-dependent using a trick such as UserData*/
-/*@null@*/xbt_set_t gras_datadesc_set_local=NULL;
+/*@null@*/ xbt_set_t gras_datadesc_set_local = NULL;
 
 
 /* callback for array size when sending strings */
-static int
-_strlen_cb(/*@unused@*/gras_datadesc_type_t type,/*@unused@*/gras_cbps_t vars, void *data) {
+static int _strlen_cb( /*@unused@ */ gras_datadesc_type_t type, /*@unused@ */
+                      gras_cbps_t vars, void *data)
+{
 
-       return 1+(int)strlen(data);
+  return 1 + (int) strlen(data);
 }
 
 
@@ -31,128 +32,130 @@ _strlen_cb(/*@unused@*/gras_datadesc_type_t type,/*@unused@*/gras_cbps_t vars, v
  * FIXME: We assume that when neither signed nor unsigned is given,
  *    that means signed. To be checked by configure.
  **/
-void
-gras_datadesc_init(void) {
-       gras_datadesc_type_t ddt; /* What to add */
-
-       /* only initialize once */
-       if (gras_datadesc_set_local != NULL)
-               return;
-
-       VERB0("Initializing DataDesc");
-
-       gras_datadesc_set_local = xbt_set_new();
-
-
-       /* all known datatypes */
-
-       ddt = gras_datadesc_scalar("signed char",
-                       gras_ddt_scalar_char,
-                       e_gras_dd_scalar_encoding_sint);
-       ddt = gras_datadesc_scalar("char",
-                       gras_ddt_scalar_char,
-                       e_gras_dd_scalar_encoding_sint);
-       ddt = gras_datadesc_scalar("unsigned char",
-                       gras_ddt_scalar_char,
-                       e_gras_dd_scalar_encoding_uint);
-
-       ddt = gras_datadesc_scalar("signed short int",
-                       gras_ddt_scalar_short,
-                       e_gras_dd_scalar_encoding_sint);
-       ddt = gras_datadesc_scalar("short int",
-                       gras_ddt_scalar_short,
-                       e_gras_dd_scalar_encoding_sint);
-       ddt = gras_datadesc_scalar("short",
-                       gras_ddt_scalar_short,
-                       e_gras_dd_scalar_encoding_sint);
-       ddt = gras_datadesc_scalar("unsigned short int",
-                       gras_ddt_scalar_short,
-                       e_gras_dd_scalar_encoding_uint);
-
-       ddt = gras_datadesc_scalar("signed int",
-                       gras_ddt_scalar_int,
-                       e_gras_dd_scalar_encoding_sint);
-       ddt = gras_datadesc_scalar("int",
-                       gras_ddt_scalar_int,
-                       e_gras_dd_scalar_encoding_sint);
-       ddt = gras_datadesc_scalar("unsigned int",
-                       gras_ddt_scalar_int,
-                       e_gras_dd_scalar_encoding_uint);
-
-       ddt = gras_datadesc_scalar("signed long int",
-                       gras_ddt_scalar_long,
-                       e_gras_dd_scalar_encoding_sint);
-       ddt = gras_datadesc_scalar("long int",
-                       gras_ddt_scalar_long,
-                       e_gras_dd_scalar_encoding_sint);
-       ddt = gras_datadesc_scalar("long",
-                       gras_ddt_scalar_long,
-                       e_gras_dd_scalar_encoding_sint);
-       ddt = gras_datadesc_scalar("unsigned long int",
-                       gras_ddt_scalar_long,
-                       e_gras_dd_scalar_encoding_uint);
-
-       ddt = gras_datadesc_scalar("signed long long int",
-                       gras_ddt_scalar_long_long,
-                       e_gras_dd_scalar_encoding_sint);
-       ddt = gras_datadesc_scalar("long long int",
-                       gras_ddt_scalar_long_long,
-                       e_gras_dd_scalar_encoding_sint);
-       ddt = gras_datadesc_scalar("unsigned long long int",
-                       gras_ddt_scalar_long_long,
-                       e_gras_dd_scalar_encoding_uint);
-
-       ddt = gras_datadesc_scalar("data pointer",
-                       gras_ddt_scalar_pdata,
-                       e_gras_dd_scalar_encoding_uint);
-       ddt = gras_datadesc_scalar("function pointer",
-                       gras_ddt_scalar_pfunc,
-                       e_gras_dd_scalar_encoding_uint);
-
-       ddt = gras_datadesc_scalar("float",
-                       gras_ddt_scalar_float,
-                       e_gras_dd_scalar_encoding_float);
-       ddt = gras_datadesc_scalar("double",
-                       gras_ddt_scalar_double,
-                       e_gras_dd_scalar_encoding_float);
-
-       ddt = gras_datadesc_array_dyn("char[]",
-                       gras_datadesc_by_name("char"),
-                       _strlen_cb);
-       gras_datadesc_ref("string",ddt);
-       gras_datadesc_ref("xbt_string_t",ddt);
-
-       /* specific datatype: the exception type (for RPC) */
-       ddt = gras_datadesc_struct("ex_t");
-       gras_datadesc_struct_append(ddt,"msg",gras_datadesc_by_name("string"));
-       gras_datadesc_struct_append(ddt,"category",gras_datadesc_by_name("int"));
-       gras_datadesc_struct_append(ddt,"value",gras_datadesc_by_name("int"));
-
-       gras_datadesc_struct_append(ddt,"remote",gras_datadesc_by_name("short int"));
-
-       gras_datadesc_struct_append(ddt,"host",gras_datadesc_by_name("string"));
-       gras_datadesc_struct_append(ddt,"procname",gras_datadesc_by_name("string"));
-       gras_datadesc_struct_append(ddt,"pid",gras_datadesc_by_name("long int"));
-       gras_datadesc_struct_append(ddt,"file",gras_datadesc_by_name("string"));
-       gras_datadesc_struct_append(ddt,"line",gras_datadesc_by_name("int"));
-       gras_datadesc_struct_append(ddt,"func",gras_datadesc_by_name("string"));
-       gras_datadesc_struct_append(ddt,"used",gras_datadesc_by_name("int"));
-       gras_datadesc_cb_field_push(ddt,"used");
-       gras_datadesc_struct_append(ddt,"bt_strings",
-                       gras_datadesc_ref_pop_arr(gras_datadesc_by_name("string")));
-
-       gras_datadesc_struct_close(ddt);
-
-       /* specific datatype: xbt_peer_t */
-       ddt = gras_datadesc_struct("s_xbt_peer_t");
-       gras_datadesc_struct_append(ddt,"name",gras_datadesc_by_name("string"));
-       gras_datadesc_struct_append(ddt,"port",gras_datadesc_by_name("int"));
-       gras_datadesc_struct_close(ddt);
-
-       ddt = gras_datadesc_ref("xbt_peer_t",ddt);
-
-       /* Dict containing the constant value (for the parsing macro) */
-       gras_dd_constants = xbt_dict_new();
+void gras_datadesc_init(void)
+{
+  gras_datadesc_type_t ddt;     /* What to add */
+
+  /* only initialize once */
+  if (gras_datadesc_set_local != NULL)
+    return;
+
+  VERB0("Initializing DataDesc");
+
+  gras_datadesc_set_local = xbt_set_new();
+
+
+  /* all known datatypes */
+
+  ddt = gras_datadesc_scalar("signed char",
+                             gras_ddt_scalar_char,
+                             e_gras_dd_scalar_encoding_sint);
+  ddt = gras_datadesc_scalar("char",
+                             gras_ddt_scalar_char,
+                             e_gras_dd_scalar_encoding_sint);
+  ddt = gras_datadesc_scalar("unsigned char",
+                             gras_ddt_scalar_char,
+                             e_gras_dd_scalar_encoding_uint);
+
+  ddt = gras_datadesc_scalar("signed short int",
+                             gras_ddt_scalar_short,
+                             e_gras_dd_scalar_encoding_sint);
+  ddt = gras_datadesc_scalar("short int",
+                             gras_ddt_scalar_short,
+                             e_gras_dd_scalar_encoding_sint);
+  ddt = gras_datadesc_scalar("short",
+                             gras_ddt_scalar_short,
+                             e_gras_dd_scalar_encoding_sint);
+  ddt = gras_datadesc_scalar("unsigned short int",
+                             gras_ddt_scalar_short,
+                             e_gras_dd_scalar_encoding_uint);
+
+  ddt = gras_datadesc_scalar("signed int",
+                             gras_ddt_scalar_int,
+                             e_gras_dd_scalar_encoding_sint);
+  ddt = gras_datadesc_scalar("int",
+                             gras_ddt_scalar_int,
+                             e_gras_dd_scalar_encoding_sint);
+  ddt = gras_datadesc_scalar("unsigned int",
+                             gras_ddt_scalar_int,
+                             e_gras_dd_scalar_encoding_uint);
+
+  ddt = gras_datadesc_scalar("signed long int",
+                             gras_ddt_scalar_long,
+                             e_gras_dd_scalar_encoding_sint);
+  ddt = gras_datadesc_scalar("long int",
+                             gras_ddt_scalar_long,
+                             e_gras_dd_scalar_encoding_sint);
+  ddt = gras_datadesc_scalar("long",
+                             gras_ddt_scalar_long,
+                             e_gras_dd_scalar_encoding_sint);
+  ddt = gras_datadesc_scalar("unsigned long int",
+                             gras_ddt_scalar_long,
+                             e_gras_dd_scalar_encoding_uint);
+
+  ddt = gras_datadesc_scalar("signed long long int",
+                             gras_ddt_scalar_long_long,
+                             e_gras_dd_scalar_encoding_sint);
+  ddt = gras_datadesc_scalar("long long int",
+                             gras_ddt_scalar_long_long,
+                             e_gras_dd_scalar_encoding_sint);
+  ddt = gras_datadesc_scalar("unsigned long long int",
+                             gras_ddt_scalar_long_long,
+                             e_gras_dd_scalar_encoding_uint);
+
+  ddt = gras_datadesc_scalar("data pointer",
+                             gras_ddt_scalar_pdata,
+                             e_gras_dd_scalar_encoding_uint);
+  ddt = gras_datadesc_scalar("function pointer",
+                             gras_ddt_scalar_pfunc,
+                             e_gras_dd_scalar_encoding_uint);
+
+  ddt = gras_datadesc_scalar("float",
+                             gras_ddt_scalar_float,
+                             e_gras_dd_scalar_encoding_float);
+  ddt = gras_datadesc_scalar("double",
+                             gras_ddt_scalar_double,
+                             e_gras_dd_scalar_encoding_float);
+
+  ddt = gras_datadesc_array_dyn("char[]",
+                                gras_datadesc_by_name("char"), _strlen_cb);
+  gras_datadesc_ref("string", ddt);
+  gras_datadesc_ref("xbt_string_t", ddt);
+
+  /* specific datatype: the exception type (for RPC) */
+  ddt = gras_datadesc_struct("ex_t");
+  gras_datadesc_struct_append(ddt, "msg", gras_datadesc_by_name("string"));
+  gras_datadesc_struct_append(ddt, "category", gras_datadesc_by_name("int"));
+  gras_datadesc_struct_append(ddt, "value", gras_datadesc_by_name("int"));
+
+  gras_datadesc_struct_append(ddt, "remote",
+                              gras_datadesc_by_name("short int"));
+
+  gras_datadesc_struct_append(ddt, "host", gras_datadesc_by_name("string"));
+  gras_datadesc_struct_append(ddt, "procname",
+                              gras_datadesc_by_name("string"));
+  gras_datadesc_struct_append(ddt, "pid", gras_datadesc_by_name("long int"));
+  gras_datadesc_struct_append(ddt, "file", gras_datadesc_by_name("string"));
+  gras_datadesc_struct_append(ddt, "line", gras_datadesc_by_name("int"));
+  gras_datadesc_struct_append(ddt, "func", gras_datadesc_by_name("string"));
+  gras_datadesc_struct_append(ddt, "used", gras_datadesc_by_name("int"));
+  gras_datadesc_cb_field_push(ddt, "used");
+  gras_datadesc_struct_append(ddt, "bt_strings",
+                              gras_datadesc_ref_pop_arr(gras_datadesc_by_name
+                                                        ("string")));
+
+  gras_datadesc_struct_close(ddt);
+
+  /* specific datatype: xbt_peer_t */
+  ddt = gras_datadesc_struct("s_xbt_peer_t");
+  gras_datadesc_struct_append(ddt, "name", gras_datadesc_by_name("string"));
+  gras_datadesc_struct_append(ddt, "port", gras_datadesc_by_name("int"));
+  gras_datadesc_struct_close(ddt);
+
+  ddt = gras_datadesc_ref("xbt_peer_t", ddt);
+
+  /* Dict containing the constant value (for the parsing macro) */
+  gras_dd_constants = xbt_dict_new();
 
 }
 
@@ -161,23 +164,24 @@ gras_datadesc_init(void) {
  *
  * Finalize the datadesc module
  **/
-void
-gras_datadesc_exit(void) {
-       VERB0("Exiting DataDesc");
-       xbt_set_free(&gras_datadesc_set_local);
-       xbt_dict_free(&gras_dd_constants);
-       DEBUG0("Exited DataDesc");
+void gras_datadesc_exit(void)
+{
+  VERB0("Exiting DataDesc");
+  xbt_set_free(&gras_datadesc_set_local);
+  xbt_dict_free(&gras_dd_constants);
+  DEBUG0("Exited DataDesc");
 }
 
 /** This is mainly to debug */
-const char *
-gras_datadesc_get_name(gras_datadesc_type_t ddt) {
-       return ddt?(const char*)ddt->name:"(null)";
+const char *gras_datadesc_get_name(gras_datadesc_type_t ddt)
+{
+  return ddt ? (const char *) ddt->name : "(null)";
 }
+
 /** This is mainly to debug */
-int
-gras_datadesc_get_id(gras_datadesc_type_t ddt) {
-       return ddt->code;
+int gras_datadesc_get_id(gras_datadesc_type_t ddt)
+{
+  return ddt->code;
 }
 
 /**
@@ -186,8 +190,9 @@ gras_datadesc_get_id(gras_datadesc_type_t ddt) {
  * Returns the size occuped by data of this type (on the current arch).
  *
  */
-int gras_datadesc_size(gras_datadesc_type_t type) {
-       return type?type->size[GRAS_THISARCH]:0;
+int gras_datadesc_size(gras_datadesc_type_t type)
+{
+  return type ? type->size[GRAS_THISARCH] : 0;
 }
 
 /**
@@ -195,57 +200,55 @@ int gras_datadesc_size(gras_datadesc_type_t type) {
  *
  * For debugging purpose
  */
-void gras_datadesc_type_dump(const gras_datadesc_type_t ddt){
-       unsigned int cpt;
-
-       printf("DataDesc dump:");
-       if(!ddt) {
-               printf("(null)\n");
-               return;
-       }
-       printf ("%s (ID:%d)\n",ddt->name,ddt->code);
-       printf ("  category: %s\n",gras_datadesc_cat_names[ddt->category_code]);
-
-       printf ("  size[");
-       for (cpt=0; cpt<gras_arch_count; cpt++) {
-               printf("%s%s%ld%s",
-                               cpt>0?", ":"",
-                                               cpt == GRAS_THISARCH ? ">":"",
-                                                               ddt->size[cpt],
-                                                               cpt == GRAS_THISARCH ? "<":"");
-       }
-       printf ("]\n");
-
-       printf ("  alignment[");
-       for (cpt=0; cpt<gras_arch_count; cpt++) {
-               printf("%s%s%ld%s",
-                               cpt>0?", ":"",
-                                               cpt == GRAS_THISARCH ? ">":"",
-                                                               ddt->alignment[cpt],
-                                                               cpt == GRAS_THISARCH ? "<":"");
-       }
-       printf ("]\n");
-
-       printf ("  aligned_size[");
-       for (cpt=0; cpt<gras_arch_count; cpt++) {
-               printf("%s%s%ld%s",
-                               cpt>0?", ":"",
-                                               cpt == GRAS_THISARCH ? ">":"",
-                                                               ddt->aligned_size[cpt],
-                                                               cpt == GRAS_THISARCH ? "<":"");
-       }
-       printf ("]\n");
-       if (ddt->category_code == e_gras_datadesc_type_cat_struct) {
-               gras_dd_cat_struct_t struct_data;
-               gras_dd_cat_field_t  field;
-
-               struct_data = ddt->category.struct_data;
-               xbt_dynar_foreach(struct_data.fields, cpt, field) {
-                       printf(">>> Dump field #%d (%s) (offset=%ld)\n",
-                                       cpt,field->name,field->offset[GRAS_THISARCH]);
-                       gras_datadesc_type_dump(field->type);
-                       printf("<<< end dump field #%d (%s)\n",cpt,field->name);
-               }
-       }
-       fflush(stdout);
+void gras_datadesc_type_dump(const gras_datadesc_type_t ddt)
+{
+  unsigned int cpt;
+
+  printf("DataDesc dump:");
+  if (!ddt) {
+    printf("(null)\n");
+    return;
+  }
+  printf("%s (ID:%d)\n", ddt->name, ddt->code);
+  printf("  category: %s\n", gras_datadesc_cat_names[ddt->category_code]);
+
+  printf("  size[");
+  for (cpt = 0; cpt < gras_arch_count; cpt++) {
+    printf("%s%s%ld%s",
+           cpt > 0 ? ", " : "",
+           cpt == GRAS_THISARCH ? ">" : "",
+           ddt->size[cpt], cpt == GRAS_THISARCH ? "<" : "");
+  }
+  printf("]\n");
+
+  printf("  alignment[");
+  for (cpt = 0; cpt < gras_arch_count; cpt++) {
+    printf("%s%s%ld%s",
+           cpt > 0 ? ", " : "",
+           cpt == GRAS_THISARCH ? ">" : "",
+           ddt->alignment[cpt], cpt == GRAS_THISARCH ? "<" : "");
+  }
+  printf("]\n");
+
+  printf("  aligned_size[");
+  for (cpt = 0; cpt < gras_arch_count; cpt++) {
+    printf("%s%s%ld%s",
+           cpt > 0 ? ", " : "",
+           cpt == GRAS_THISARCH ? ">" : "",
+           ddt->aligned_size[cpt], cpt == GRAS_THISARCH ? "<" : "");
+  }
+  printf("]\n");
+  if (ddt->category_code == e_gras_datadesc_type_cat_struct) {
+    gras_dd_cat_struct_t struct_data;
+    gras_dd_cat_field_t field;
+
+    struct_data = ddt->category.struct_data;
+    xbt_dynar_foreach(struct_data.fields, cpt, field) {
+      printf(">>> Dump field #%d (%s) (offset=%ld)\n",
+             cpt, field->name, field->offset[GRAS_THISARCH]);
+      gras_datadesc_type_dump(field->type);
+      printf("<<< end dump field #%d (%s)\n", cpt, field->name);
+    }
+  }
+  fflush(stdout);
 }