res->name_len = strlen(name);
res->cycle = 0;
- xbt_set_add(gras_datadesc_set_local, (xbt_set_elm_t) res, gras_ddt_freev);
+ xbt_set_add(gras_datadesc_set_local, (xbt_set_elm_t) res,
+ gras_ddt_freev);
XBT_OUT;
return res;
}
volatile int found = 0;
TRY {
res =
- (gras_datadesc_type_t) xbt_set_get_by_name(gras_datadesc_set_local,
- name);
+ (gras_datadesc_type_t) xbt_set_get_by_name(gras_datadesc_set_local,
+ name);
found = 1;
} CATCH(e) {
if (e.category != not_found_error)
gras_datadesc_type_t res = NULL;
TRY {
res =
- (gras_datadesc_type_t) xbt_set_get_by_id(gras_datadesc_set_local, code);
+ (gras_datadesc_type_t) xbt_set_get_by_id(gras_datadesc_set_local,
+ code);
} CATCH(e) {
if (e.category != not_found_error)
RETHROW;
res->size[arch] = gras_arches[arch].sizeofs[type];
res->alignment[arch] = gras_arches[arch].boundaries[type];
res->aligned_size[arch] =
- ddt_aligned(res->size[arch], res->alignment[arch]);
+ ddt_aligned(res->size[arch], res->alignment[arch]);
}
res->category_code = e_gras_datadesc_type_cat_scalar;
/* FIXME: Check that field redefinition matches */
xbt_assert1(res->category_code == e_gras_datadesc_type_cat_struct,
"Redefinition of type %s does not match", name);
- VERB1("Discarding redefinition of %s", name);
+ DEBUG1("Discarding redefinition of %s", name);
return res;
}
res = gras_ddt_new(name);
}
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);
+ xbt_dynar_new(sizeof(gras_dd_cat_field_t), gras_dd_cat_field_free);
XBT_OUT;
return res;
/** \brief Append a new field to a structure description */
void
gras_datadesc_struct_append(gras_datadesc_type_t struct_type,
- const char *name, gras_datadesc_type_t field_type)
+ const char *name,
+ gras_datadesc_type_t field_type)
{
gras_dd_cat_field_t field;
name, struct_type->name);
XBT_IN3("(%s %s.%s;)", field_type->name, struct_type->name, name);
if (struct_type->category.struct_data.closed) {
- VERB1
- ("Ignoring request to add field to struct %s (closed. Redefinition?)",
- struct_type->name);
+ DEBUG1
+ ("Ignoring request to add field to struct %s (closed. Redefinition?)",
+ struct_type->name);
return;
}
xbt_dynar_push(struct_type->category.struct_data.fields, &field);
DEBUG3("Push a %s into %s at offset %ld.",
- field_type->name, struct_type->name, field->offset[GRAS_THISARCH]);
+ field_type->name, struct_type->name,
+ field->offset[GRAS_THISARCH]);
DEBUG3(" f={size=%ld,align=%ld,asize=%ld}",
field_type->size[GRAS_THISARCH],
field_type->alignment[GRAS_THISARCH],
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);
+ xbt_dynar_new(sizeof(gras_dd_cat_field_t *), gras_dd_cat_field_free);
res->category.union_data.selector = selector;
return res;
union_type->alignment[arch] = max(union_type->alignment[arch],
field_type->alignment[arch]);
union_type->aligned_size[arch] = ddt_aligned(union_type->size[arch],
- union_type->alignment[arch]);
+ union_type->alignment
+ [arch]);
}
}
{
gras_datadesc_type_t res;
- gras_datadesc_type_t pointer_type = gras_datadesc_by_name("data pointer");
+ gras_datadesc_type_t pointer_type =
+ gras_datadesc_by_name("data pointer");
int arch;
XBT_IN1("(%s)", name);
"Redefinition of %s does not match", name);
xbt_assert1(res->category.ref_data.selector == NULL,
"Redefinition of %s does not match", name);
- VERB1("Discarding redefinition of %s", name);
+ DEBUG1("Discarding redefinition of %s", name);
return res;
}
* callback and expects it to return the type description to use.
*/
gras_datadesc_type_t
-gras_datadesc_ref_generic(const char *name, gras_datadesc_selector_t selector)
+gras_datadesc_ref_generic(const char *name,
+ gras_datadesc_selector_t selector)
{
gras_datadesc_type_t res;
- gras_datadesc_type_t pointer_type = gras_datadesc_by_name("data pointer");
+ gras_datadesc_type_t pointer_type =
+ gras_datadesc_by_name("data pointer");
int arch;
XBT_IN1("(%s)", name);
"Redefinition of type %s does not match", name);
if (res->category.array_data.type != element_type) {
- ERROR1("Redefinition of type %s does not match: array elements differ",
- name);
+ ERROR1
+ ("Redefinition of type %s does not match: array elements differ",
+ name);
gras_datadesc_type_dump(res->category.array_data.type);
gras_datadesc_type_dump(element_type);
}
gras_datadesc_type_t
gras_datadesc_ref_pop_arr(gras_datadesc_type_t element_type)
{
- int cpt=0;
- gras_datadesc_type_t res,ddt2;
+ int cpt = 0;
+ gras_datadesc_type_t res, ddt2;
char *name = (char *) xbt_malloc(strlen(element_type->name) + 4);
sprintf(name, "%s[]", element_type->name);
while (ddt2) {
free(name);
- name=bprintf("%s[]_%d",element_type->name,cpt++);
- ddt2=gras_datadesc_by_name_or_null(name);
+ name = bprintf("%s[]_%d", element_type->name, cpt++);
+ ddt2 = gras_datadesc_by_name_or_null(name);
}
res = gras_datadesc_array_dyn(name, element_type, gras_datadesc_cb_pop);
sprintf(name, "%s[]*", element_type->name);
- cpt=0;
+ cpt = 0;
ddt2 = gras_datadesc_by_name_or_null(name);
while (ddt2) {
free(name);
- name=bprintf("%s[]*_%d",element_type->name,cpt++);
- ddt2=gras_datadesc_by_name_or_null(name);
+ name = bprintf("%s[]*_%d", element_type->name, cpt++);
+ ddt2 = gras_datadesc_by_name_or_null(name);
}
res = gras_datadesc_ref(name, res);
char *buffname;
gras_datadesc_type_t res;
- asprintf(&buffname, "s_xbt_dynar_of_%s", elm_t->name);
+ buffname = bprintf("s_xbt_dynar_of_%s", elm_t->name);
res = gras_datadesc_struct(buffname);
gras_datadesc_struct_append(res, "elmsize",
gras_datadesc_by_name("unsigned long int"));
- gras_datadesc_struct_append(res, "data", gras_datadesc_ref_pop_arr(elm_t));
+ gras_datadesc_struct_append(res, "data",
+ gras_datadesc_ref_pop_arr(elm_t));
gras_datadesc_struct_append(res, "free_f",
gras_datadesc_by_name("function pointer"));
/* build a ref to it */
free(buffname);
- asprintf(&buffname, "xbt_dynar_of_%s", elm_t->name);
+ buffname = bprintf("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)
+gras_datadesc_matrix(gras_datadesc_type_t elm_t,
+ void_f_pvoid_t const free_f)
{
char *buffname;
gras_datadesc_type_t res;
- asprintf(&buffname, "s_xbt_matrix_t(%s)", elm_t->name);
+ buffname = bprintf("s_xbt_matrix_t(%s)", elm_t->name);
res = gras_datadesc_struct(buffname);
gras_datadesc_struct_append(res, "lines",
gras_datadesc_struct_append(res, "elmsize",
gras_datadesc_by_name("unsigned long int"));
- gras_datadesc_struct_append(res, "data", gras_datadesc_ref_pop_arr(elm_t));
+ gras_datadesc_struct_append(res, "data",
+ gras_datadesc_ref_pop_arr(elm_t));
gras_datadesc_struct_append(res, "free_f",
gras_datadesc_by_name("function pointer"));
gras_datadesc_struct_close(res);
/* build a ref to it */
free(buffname);
- asprintf(&buffname, "xbt_matrix_t(%s)", elm_t->name);
+ buffname = bprintf("xbt_matrix_t(%s)", elm_t->name);
res = gras_datadesc_ref(buffname, res);
free(buffname);
return res;
gras_datadesc_type_t
gras_datadesc_import_nws(const char *name,
- const DataDescriptor * desc, unsigned long howmany)
+ const DataDescriptor * desc,
+ unsigned long howmany)
{
THROW_UNIMPLEMENTED;
}
field->send = gras_datadesc_cb_push_ulint;
} else {
ERROR1
- ("Field %s is not an int, unsigned int, long int neither unsigned long int",
- sub_type->name);
+ ("Field %s is not an int, unsigned int, long int neither unsigned long int",
+ sub_type->name);
xbt_abort();
}
}
field->send = gras_datadesc_cb_push_ulint_mult;
} else {
ERROR1
- ("Field %s is not an int, unsigned int, long int neither unsigned long int",
- sub_type->name);
+ ("Field %s is not an int, unsigned int, long int neither unsigned long int",
+ sub_type->name);
xbt_abort();
}
}
if (d1->aligned_size[cpt] != d2->aligned_size[cpt]) {
DEBUG5
- ("ddt_cmp: %s->aligned_size=%ld != %s->aligned_size=%ld (on %s)",
- d1->name, d1->aligned_size[cpt], d2->name, d2->aligned_size[cpt],
- gras_arches[cpt].name);
+ ("ddt_cmp: %s->aligned_size=%ld != %s->aligned_size=%ld (on %s)",
+ d1->name, d1->aligned_size[cpt], d2->name,
+ d2->aligned_size[cpt], gras_arches[cpt].name);
return d1->aligned_size[cpt] > d2->aligned_size[cpt] ? 1 : -1;
}
}
if (d1->category.scalar_data.encoding !=
d2->category.scalar_data.encoding)
return d1->category.scalar_data.encoding >
- d2->category.scalar_data.encoding ? 1 : -1;
+ d2->category.scalar_data.encoding ? 1 : -1;
break;
case e_gras_datadesc_type_cat_struct:
d2->name, xbt_dynar_length(d2->category.struct_data.fields));
return xbt_dynar_length(d1->category.struct_data.fields) >
- xbt_dynar_length(d2->category.struct_data.fields) ? 1 : -1;
+ xbt_dynar_length(d2->category.struct_data.fields) ? 1 : -1;
}
xbt_dynar_foreach(d1->category.struct_data.fields, cpt, field1) {
field2 =
- xbt_dynar_get_as(d2->category.struct_data.fields, cpt,
- gras_dd_cat_field_t);
+ xbt_dynar_get_as(d2->category.struct_data.fields, cpt,
+ gras_dd_cat_field_t);
field_desc_1 = field1->type;
field_desc_2 = field2->type;
ret = gras_datadesc_type_cmp(field_desc_1, field_desc_2);
break;
case e_gras_datadesc_type_cat_union:
- if (d1->category.union_data.selector != d2->category.union_data.selector)
+ if (d1->category.union_data.selector !=
+ d2->category.union_data.selector)
return 1; /* ISO C forbids ordered comparisons of pointers to functions */
if (xbt_dynar_length(d1->category.union_data.fields) !=
xbt_dynar_length(d2->category.union_data.fields))
return xbt_dynar_length(d1->category.union_data.fields) >
- xbt_dynar_length(d2->category.union_data.fields) ? 1 : -1;
+ xbt_dynar_length(d2->category.union_data.fields) ? 1 : -1;
xbt_dynar_foreach(d1->category.union_data.fields, cpt, field1) {
field2 =
- xbt_dynar_get_as(d2->category.union_data.fields, cpt,
- gras_dd_cat_field_t);
+ xbt_dynar_get_as(d2->category.union_data.fields, cpt,
+ gras_dd_cat_field_t);
field_desc_1 = field1->type;
field_desc_2 = field2->type;
ret = gras_datadesc_type_cmp(field_desc_1, field_desc_2);
return 1; /* ISO C forbids ordered comparisons of pointers to functions */
if (d1->category.ref_data.type != d2->category.ref_data.type)
- return d1->category.ref_data.type > d2->category.ref_data.type ? 1 : -1;
+ return d1->category.ref_data.type >
+ d2->category.ref_data.type ? 1 : -1;
break;
case e_gras_datadesc_type_cat_array:
if (d1->category.array_data.type != d2->category.array_data.type)
return d1->category.array_data.type >
- d2->category.array_data.type ? 1 : -1;
+ d2->category.array_data.type ? 1 : -1;
if (d1->category.array_data.fixed_size !=
d2->category.array_data.fixed_size)
return d1->category.array_data.fixed_size >
- d2->category.array_data.fixed_size ? 1 : -1;
+ d2->category.array_data.fixed_size ? 1 : -1;
if (d1->category.array_data.dynamic_size !=
d2->category.array_data.dynamic_size)