xbt_string_t (C definition in xbt/str.h, right for us) is an acknoledged alias to...

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

diff --git a/src/gras/DataDesc/datadesc.c b/src/gras/DataDesc/datadesc.c
index 004436f..1f99e5f 100644 (file)
--- a/src/gras/DataDesc/datadesc.c
+++ b/src/gras/DataDesc/datadesc.c
@@ -11,7 +11,7 @@
 
 #include "gras/DataDesc/datadesc_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(datadesc,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;
 
@@ -43,6 +43,9 @@ gras_datadesc_init(void) {
   
   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);
@@ -59,6 +62,9 @@ gras_datadesc_init(void) {
   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);
@@ -79,6 +85,9 @@ gras_datadesc_init(void) {
   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);
@@ -110,8 +119,41 @@ gras_datadesc_init(void) {
   ddt = gras_datadesc_array_dyn("char[]", 
                                gras_datadesc_by_name("char"),
                                _strlen_cb);
-  ddt = gras_datadesc_ref("string",ddt);
-
+  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();
+  
 }
 
 /**
@@ -123,6 +165,7 @@ void
 gras_datadesc_exit(void) {
   VERB0("Exiting DataDesc");
   xbt_set_free(&gras_datadesc_set_local);
+  xbt_dict_free(&gras_dd_constants);
   DEBUG0("Exited DataDesc");
 }