#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;
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("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("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);
_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"));
gras_datadesc_struct_close(ddt);
-
- 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();
}
gras_datadesc_exit(void) {
VERB0("Exiting DataDesc");
xbt_set_free(&gras_datadesc_set_local);
+ xbt_dict_free(&gras_dd_constants);
DEBUG0("Exited DataDesc");
}