X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8c0a8b86fcd472830e5eb55b27f5946b4538aa8a..c7b2c29e2b9a749e6d4d2c6bf34c1e2501c274e1:/src/gras/DataDesc/datadesc.c diff --git a/src/gras/DataDesc/datadesc.c b/src/gras/DataDesc/datadesc.c index 1589ecf26f..d0202e291b 100644 --- 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); @@ -112,7 +115,7 @@ gras_datadesc_init(void) { _strlen_cb); ddt = gras_datadesc_ref("string",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")); @@ -131,8 +134,19 @@ gras_datadesc_init(void) { gras_datadesc_struct_append(ddt,"bt_strings", gras_datadesc_ref_pop_arr(gras_datadesc_by_name("string"))); - // gras_datadesc_struct_append(ddt,"bt"); gras_datadesc_struct_close(ddt); + + /* specific datatype: xbt_host_t */ + ddt = gras_datadesc_struct("s_xbt_host_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_host_t",ddt); + + /* Dict containing the constant value (for the parsing macro) */ + gras_dd_constants = xbt_dict_new(); + } /** @@ -144,6 +158,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"); }