#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;
/* callback for array size when sending strings */
static int
-_strlen_cb(/*@unused@*/gras_cbps_t vars, void *data) {
+_strlen_cb(/*@unused@*/gras_datadesc_type_t type,/*@unused@*/gras_cbps_t vars, void *data) {
return 1+(int)strlen(data);
}
_strlen_cb);
ddt = gras_datadesc_ref("string",ddt);
+
+ 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);
+
+
+ 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();
+
}
/**
}
/** This is mainly to debug */
-char *
+const char *
gras_datadesc_get_name(gras_datadesc_type_t ddt) {
- return ddt->name;
+ return ddt?(const char*)ddt->name:"(null)";
}
/** This is mainly to debug */
int
*
*/
int gras_datadesc_size(gras_datadesc_type_t type) {
- return type->size[GRAS_THISARCH];
+ return type?type->size[GRAS_THISARCH]:0;
}
/**