X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a0cf4f541ebaa9d44fd3c8966d078713dd9ee224..1dc76e8e1d473b480e814d77d584d707c5a5cec7:/src/gras/DataDesc/datadesc.c diff --git a/src/gras/DataDesc/datadesc.c b/src/gras/DataDesc/datadesc.c index 1f7cb1cf83..1f99e5fe96 100644 --- a/src/gras/DataDesc/datadesc.c +++ b/src/gras/DataDesc/datadesc.c @@ -62,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); @@ -82,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); @@ -113,7 +119,8 @@ 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"); @@ -136,13 +143,13 @@ gras_datadesc_init(void) { gras_datadesc_struct_close(ddt); - /* specific datatype: xbt_host_t */ - ddt = gras_datadesc_struct("s_xbt_host_t"); + /* 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_host_t",ddt); + ddt = gras_datadesc_ref("xbt_peer_t",ddt); /* Dict containing the constant value (for the parsing macro) */ gras_dd_constants = xbt_dict_new(); @@ -158,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"); }