res->cycle = 0;
xbt_set_add(gras_datadesc_set_local,
- (xbt_set_elm_t)res,&gras_ddt_freev);
+ (xbt_set_elm_t)res,gras_ddt_freev);
XBT_OUT;
return res;
}
res->category_code = e_gras_datadesc_type_cat_struct;
res->category.struct_data.fields =
xbt_dynar_new(sizeof(gras_dd_cat_field_t),
- &gras_dd_cat_field_free);
+ gras_dd_cat_field_free);
XBT_OUT;
return res;
res->category_code = e_gras_datadesc_type_cat_union;
res->category.union_data.fields =
xbt_dynar_new(sizeof(gras_dd_cat_field_t*),
- &gras_dd_cat_field_free);
+ gras_dd_cat_field_free);
res->category.union_data.selector = selector;
return res;
union_type->category.union_data.closed = 1;
}
+/** \brief Copy a type under another name
+ *
+ * This may reveal useful to circumvent parsing macro limitations
+ */
+gras_datadesc_type_t
+ gras_datadesc_copy(const char *name,
+ gras_datadesc_type_t copied) {
+
+ gras_datadesc_type_t res = gras_ddt_new(name);
+ char *name_cpy = res->name;
+
+ memcpy(res,copied,sizeof(s_gras_datadesc_type_t));
+ res->name = name_cpy;
+ return res;
+ }
+
/** \brief Declare a new type being a reference to the one passed in arg */
gras_datadesc_type_t
gras_datadesc_ref(const char *name,
dynar->elmsize = subtype->size[GRAS_THISARCH];
dynar->size = dynar->used;
+ dynar->mutex = NULL;
}
/** \brief Declare a new type being a dynar in which each elements are of the given type
*/
gras_datadesc_type_t
gras_datadesc_dynar(gras_datadesc_type_t elm_t,
- void_f_pvoid_t *free_func) {
+ void_f_pvoid_t free_func) {
char *buffname;
gras_datadesc_type_t res;
- asprintf(&buffname,"dynar(%s)_s",elm_t->name);
+ asprintf(&buffname,"s_xbt_dynar_of_%s",elm_t->name);
res = gras_datadesc_struct(buffname);
gras_datadesc_by_name("function pointer"));
memcpy(res->extra,&free_func,sizeof(free_func));
+ gras_datadesc_struct_append(res, "mutex",
+ gras_datadesc_by_name("data pointer"));
+
gras_datadesc_struct_close(res);
gras_datadesc_cb_field_push(res, "used");
/* build a ref to it */
free(buffname);
- asprintf(&buffname,"dynar(%s)",elm_t->name);
+ asprintf(&buffname,"xbt_dynar_of_%s",elm_t->name);
res=gras_datadesc_ref(buffname,res);
free(buffname);
return res;
}
gras_datadesc_type_t
gras_datadesc_matrix(gras_datadesc_type_t elm_t,
- void_f_pvoid_t * const free_f) {
+ void_f_pvoid_t const free_f) {
char *buffname;
gras_datadesc_type_t res;
xbt_dynar_t field_array;
gras_dd_cat_field_t field=NULL;
- int field_num;
+ unsigned int field_num;
if (type->category_code == e_gras_datadesc_type_cat_union) {
field_array = type->category.union_data.fields;
*/
int gras_datadesc_type_cmp(const gras_datadesc_type_t d1,
const gras_datadesc_type_t d2) {
- int ret,cpt;
+ int ret;
+ unsigned int cpt;
gras_dd_cat_field_t field1,field2;
gras_datadesc_type_t field_desc_1,field_desc_2;