-/* $Id$ */
-
/* ddt_new - creation/deletion of datatypes structs (private to this module)*/
-/* Copyright (c) 2003-2009 The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
{
gras_datadesc_type_t res;
- XBT_IN1("(%s)", name);
+ XBT_IN("(%s)", name);
res = xbt_new0(s_gras_datadesc_type_t, 1);
res->name = (char *) strdup(name);
res->name_len = strlen(name);
res->cycle = 0;
- xbt_set_add(gras_datadesc_set_local, (xbt_set_elm_t) res, gras_ddt_freev);
- XBT_OUT;
+ 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)
xbt_ex_free(e);
}
if (!found)
- THROW1(not_found_error, 0, "No registred datatype of that name: %s",
+ THROWF(not_found_error, 0, "No registred datatype of that name: %s",
name);
return res;
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;
gras_datadesc_type_t res;
long int arch;
- XBT_IN;
+ XBT_IN("");
res = gras_datadesc_by_name_or_null(name);
if (res) {
xbt_assert1(res->category_code == e_gras_datadesc_type_cat_scalar,
"Redefinition of type %s does not match", name);
xbt_assert1(res->category.scalar_data.type == type,
"Redefinition of type %s does not match", name);
- VERB1("Discarding redefinition of %s", name);
+ XBT_VERB("Discarding redefinition of %s", name);
return res;
}
res = gras_ddt_new(name);
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;
res->category.scalar_data.encoding = encoding;
res->category.scalar_data.type = type;
- XBT_OUT;
+ XBT_OUT();
return res;
}
void gras_dd_cat_field_free(void *f)
{
gras_dd_cat_field_t field = *(gras_dd_cat_field_t *) f;
- XBT_IN;
+ XBT_IN("");
if (field) {
if (field->name)
free(field->name);
free(field);
}
- XBT_OUT;
+ XBT_OUT();
}
/** \brief Declare a new structure description */
gras_datadesc_type_t res;
long int arch;
- XBT_IN1("(%s)", name);
+ XBT_IN("(%s)", name);
res = gras_datadesc_by_name_or_null(name);
if (res) {
/* 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);
+ XBT_DEBUG("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;
+ 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;
xbt_assert2(field_type,
"Cannot add the field '%s' into struct '%s': its type is NULL",
name, struct_type->name);
- XBT_IN3("(%s %s.%s;)", field_type->name, struct_type->name, name);
+ XBT_IN("(%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);
+ XBT_DEBUG
+ ("Ignoring request to add field to struct %s (closed. Redefinition?)",
+ struct_type->name);
return;
}
field = xbt_new(s_gras_dd_cat_field_t, 1);
field->name = (char *) strdup(name);
- DEBUG0("----------------");
- DEBUG3("PRE s={size=%ld,align=%ld,asize=%ld}",
+ XBT_DEBUG("----------------");
+ XBT_DEBUG("PRE s={size=%ld,align=%ld,asize=%ld}",
struct_type->size[GRAS_THISARCH],
struct_type->alignment[GRAS_THISARCH],
struct_type->aligned_size[GRAS_THISARCH]);
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]);
- DEBUG3(" f={size=%ld,align=%ld,asize=%ld}",
+ XBT_DEBUG("Push a %s into %s at offset %ld.",
+ field_type->name, struct_type->name,
+ field->offset[GRAS_THISARCH]);
+ XBT_DEBUG(" f={size=%ld,align=%ld,asize=%ld}",
field_type->size[GRAS_THISARCH],
field_type->alignment[GRAS_THISARCH],
field_type->aligned_size[GRAS_THISARCH]);
- DEBUG3(" s={size=%ld,align=%ld,asize=%ld}",
+ XBT_DEBUG(" s={size=%ld,align=%ld,asize=%ld}",
struct_type->size[GRAS_THISARCH],
struct_type->alignment[GRAS_THISARCH],
struct_type->aligned_size[GRAS_THISARCH]);
- XBT_OUT;
+ XBT_OUT();
}
/** \brief Close a structure description
void gras_datadesc_struct_close(gras_datadesc_type_t struct_type)
{
int arch;
- XBT_IN;
+ XBT_IN("");
struct_type->category.struct_data.closed = 1;
for (arch = 0; arch < gras_arch_count; arch++) {
struct_type->size[arch] = struct_type->aligned_size[arch];
}
- DEBUG4("structure %s closed. size=%ld,align=%ld,asize=%ld",
+ XBT_DEBUG("structure %s closed. size=%ld,align=%ld,asize=%ld",
struct_type->name,
struct_type->size[GRAS_THISARCH],
struct_type->alignment[GRAS_THISARCH],
gras_datadesc_type_t res;
int arch;
- XBT_IN1("(%s)", name);
+ XBT_IN("(%s)", name);
xbt_assert0(selector,
"Attempt to creat an union without field_count function");
"Redefinition of type %s does not match", name);
xbt_assert1(res->category.union_data.selector == selector,
"Redefinition of type %s does not match", name);
- VERB1("Discarding redefinition of %s", name);
+ XBT_VERB("Discarding redefinition of %s", name);
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);
+ xbt_dynar_new(sizeof(gras_dd_cat_field_t *), gras_dd_cat_field_free);
res->category.union_data.selector = selector;
return res;
gras_dd_cat_field_t field;
int arch;
- XBT_IN3("(%s %s.%s;)", field_type->name, union_type->name, name);
+ XBT_IN("(%s %s.%s;)", field_type->name, union_type->name, name);
xbt_assert1(field_type->size[GRAS_THISARCH] >= 0,
"Cannot add a dynamically sized field in union %s",
union_type->name);
if (union_type->category.union_data.closed) {
- VERB1("Ignoring request to add field to union %s (closed)",
+ XBT_VERB("Ignoring request to add field to union %s (closed)",
union_type->name);
return;
}
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);
+ XBT_IN("(%s)", name);
res = gras_datadesc_by_name_or_null(name);
if (res) {
xbt_assert1(res->category_code == e_gras_datadesc_type_cat_ref,
"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);
+ XBT_DEBUG("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);
+ XBT_IN("(%s)", name);
res = gras_datadesc_by_name_or_null(name);
if (res) {
"Redefinition of type %s does not match", name);
xbt_assert1(res->category.ref_data.selector == selector,
"Redefinition of type %s does not match", name);
- VERB1("Discarding redefinition of %s", name);
+ XBT_VERB("Discarding redefinition of %s", name);
return res;
}
res = gras_ddt_new(name);
gras_datadesc_type_t res;
int arch;
- XBT_IN1("(%s)", name);
+ XBT_IN("(%s)", name);
res = gras_datadesc_by_name_or_null(name);
if (res) {
xbt_assert1(res->category_code == e_gras_datadesc_type_cat_array,
"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);
+ XBT_ERROR
+ ("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);
}
"Redefinition of type %s does not match", name);
xbt_assert1(res->category.array_data.dynamic_size == NULL,
"Redefinition of type %s does not match", name);
- VERB1("Discarding redefinition of %s", name);
+ XBT_VERB("Discarding redefinition of %s", name);
return res;
}
gras_datadesc_type_t res;
int arch;
- XBT_IN1("(%s)", name);
+ XBT_IN("(%s)", name);
xbt_assert1(dynamic_size,
"'%s' is a dynamic array without size discriminant", name);
"Redefinition of type %s does not match", name);
xbt_assert1(res->category.array_data.dynamic_size == dynamic_size,
"Redefinition of type %s does not match", name);
- VERB1("Discarding redefinition of %s", name);
+ XBT_VERB("Discarding redefinition of %s", name);
return res;
}
gras_datadesc_type_t
gras_datadesc_ref_pop_arr(gras_datadesc_type_t element_type)
{
-
- 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);
/* Make sure we are not trying to redefine a ddt with the same name */
ddt2 = gras_datadesc_by_name_or_null(name);
- int cpt=0;
+
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);
subtype = subtype->category.ref_data.type;
subtype = subtype->category.array_data.type;
- DEBUG1("subtype is %s", subtype->name);
+ XBT_DEBUG("subtype is %s", subtype->name);
dynar->elmsize = subtype->size[GRAS_THISARCH];
dynar->size = dynar->used;
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;
subtype = subtype->category.ref_data.type;
subtype = subtype->category.array_data.type;
- DEBUG1("subtype is %s", subtype->name);
+ XBT_DEBUG("subtype is %s", subtype->name);
matrix->elmsize = subtype->size[GRAS_THISARCH];
}
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;
}
} else if (type->category_code == e_gras_datadesc_type_cat_struct) {
field_array = type->category.struct_data.fields;
} else {
- ERROR2("%s (%p) is not a struct nor an union. There is no field.",
+ XBT_ERROR("%s (%p) is not a struct nor an union. There is no field.",
type->name, (void *) type);
xbt_abort();
}
return field;
}
}
- ERROR2("No field named '%s' in '%s'", field_name, type->name);
+ XBT_ERROR("No field named '%s' in '%s'", field_name, type->name);
xbt_abort();
}
gras_dd_cat_field_t field = gras_dd_find_field(type, field_name);
gras_datadesc_type_t sub_type = field->type;
- DEBUG3("add a PUSHy cb to '%s' field (type '%s') of '%s'",
+ XBT_DEBUG("add a PUSHy cb to '%s' field (type '%s') of '%s'",
field_name, sub_type->name, type->name);
if (!strcmp("int", sub_type->name)) {
field->send = gras_datadesc_cb_push_int;
} else if (!strcmp("unsigned long int", sub_type->name)) {
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);
+ XBT_ERROR
+ ("Field %s is not an int, unsigned int, long int neither unsigned long int",
+ sub_type->name);
xbt_abort();
}
}
gras_dd_cat_field_t field = gras_dd_find_field(type, field_name);
gras_datadesc_type_t sub_type = field->type;
- DEBUG3("add a MPUSHy cb to '%s' field (type '%s') of '%s'",
+ XBT_DEBUG("add a MPUSHy cb to '%s' field (type '%s') of '%s'",
field_name, sub_type->name, type->name);
if (!strcmp("int", sub_type->name)) {
field->send = gras_datadesc_cb_push_int_mult;
} else if (!strcmp("unsigned long int", sub_type->name)) {
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);
+ XBT_ERROR
+ ("Field %s is not an int, unsigned int, long int neither unsigned long int",
+ sub_type->name);
xbt_abort();
}
}
void gras_datadesc_free(gras_datadesc_type_t * type)
{
- DEBUG1("Let's free ddt %s", (*type)->name);
+ XBT_DEBUG("Let's free ddt %s", (*type)->name);
switch ((*type)->category_code) {
case e_gras_datadesc_type_cat_scalar:
return 0; /* easy optimization */
if (!d1 && d2) {
- DEBUG0("ddt_cmp: !d1 && d2 => 1");
+ XBT_DEBUG("ddt_cmp: !d1 && d2 => 1");
return 1;
}
if (!d1 && !d2) {
- DEBUG0("ddt_cmp: !d1 && !d2 => 0");
+ XBT_DEBUG("ddt_cmp: !d1 && !d2 => 0");
return 0;
}
if (d1 && !d2) {
- DEBUG0("ddt_cmp: d1 && !d2 => -1");
+ XBT_DEBUG("ddt_cmp: d1 && !d2 => -1");
return -1;
}
for (cpt = 0; cpt < gras_arch_count; cpt++) {
if (d1->size[cpt] != d2->size[cpt]) {
- DEBUG5("ddt_cmp: %s->size=%ld != %s->size=%ld (on %s)",
+ XBT_DEBUG("ddt_cmp: %s->size=%ld != %s->size=%ld (on %s)",
d1->name, d1->size[cpt], d2->name, d2->size[cpt],
gras_arches[cpt].name);
return d1->size[cpt] > d2->size[cpt] ? 1 : -1;
}
if (d1->alignment[cpt] != d2->alignment[cpt]) {
- DEBUG5("ddt_cmp: %s->alignment=%ld != %s->alignment=%ld (on %s)",
+ XBT_DEBUG("ddt_cmp: %s->alignment=%ld != %s->alignment=%ld (on %s)",
d1->name, d1->alignment[cpt], d2->name, d2->alignment[cpt],
gras_arches[cpt].name);
return d1->alignment[cpt] > d2->alignment[cpt] ? 1 : -1;
}
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);
+ XBT_DEBUG
+ ("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_code != d2->category_code) {
- DEBUG4("ddt_cmp: %s->cat=%s != %s->cat=%s",
+ XBT_DEBUG("ddt_cmp: %s->cat=%s != %s->cat=%s",
d1->name, gras_datadesc_cat_names[d1->category_code],
d2->name, gras_datadesc_cat_names[d2->category_code]);
return d1->category_code > d2->category_code ? 1 : -1;
}
if (d1->send != d2->send) {
- DEBUG4("ddt_cmp: %s->send=%p != %s->send=%p",
+ XBT_DEBUG("ddt_cmp: %s->send=%p != %s->send=%p",
d1->name, (void *) d1->send, d2->name, (void *) d2->send);
return 1; /* ISO C forbids ordered comparisons of pointers to functions */
}
if (d1->recv != d2->recv) {
- DEBUG4("ddt_cmp: %s->recv=%p != %s->recv=%p",
+ XBT_DEBUG("ddt_cmp: %s->recv=%p != %s->recv=%p",
d1->name, (void *) d1->recv, d2->name, (void *) d2->recv);
return 1; /* ISO C forbids ordered comparisons of pointers to functions */
}
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:
if (xbt_dynar_length(d1->category.struct_data.fields) !=
xbt_dynar_length(d2->category.struct_data.fields)) {
- DEBUG4("ddt_cmp: %s (having %lu fields) != %s (having %lu fields)",
+ XBT_DEBUG("ddt_cmp: %s (having %lu fields) != %s (having %lu fields)",
d1->name, xbt_dynar_length(d1->category.struct_data.fields),
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);
if (ret) {
- DEBUG6("%s->field[%d]=%s != %s->field[%d]=%s",
+ XBT_DEBUG("%s->field[%d]=%s != %s->field[%d]=%s",
d1->name, cpt, field1->name, d2->name, cpt, field2->name);
return ret;
}
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)
