A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Revert "Those files should not be in git."
[simgrid.git]
/
src
/
gras
/
DataDesc
/
ddt_create.c
diff --git
a/src/gras/DataDesc/ddt_create.c
b/src/gras/DataDesc/ddt_create.c
index
77c19a5
..
05eb79e
100644
(file)
--- a/
src/gras/DataDesc/ddt_create.c
+++ b/
src/gras/DataDesc/ddt_create.c
@@
-34,7
+34,7
@@
static gras_datadesc_type_t gras_ddt_new(const char *name)
{
gras_datadesc_type_t res;
- XBT_IN
1
("(%s)", name);
+ XBT_IN("(%s)", name);
res = xbt_new0(s_gras_datadesc_type_t, 1);
res->name = (char *) strdup(name);
@@
-43,7
+43,7
@@
static gras_datadesc_type_t gras_ddt_new(const char *name)
xbt_set_add(gras_datadesc_set_local, (xbt_set_elm_t) res,
gras_ddt_freev);
- XBT_OUT;
+ XBT_OUT
()
;
return res;
}
@@
-55,7
+55,8
@@
gras_datadesc_type_t gras_datadesc_by_name_or_null(const char *name)
TRY {
res = gras_datadesc_by_name(name);
- } CATCH(e) {
+ }
+ CATCH(e) {
res = NULL;
xbt_ex_free(e);
}
@@
-75,13
+76,14
@@
gras_datadesc_type_t gras_datadesc_by_name(const char *name)
(gras_datadesc_type_t) xbt_set_get_by_name(gras_datadesc_set_local,
name);
found = 1;
- } CATCH(e) {
+ }
+ CATCH(e) {
if (e.category != not_found_error)
RETHROW;
xbt_ex_free(e);
}
if (!found)
- THROW
1
(not_found_error, 0, "No registred datatype of that name: %s",
+ THROW
F
(not_found_error, 0, "No registred datatype of that name: %s",
name);
return res;
@@
-98,7
+100,8
@@
gras_datadesc_type_t gras_datadesc_by_id(long int code)
res =
(gras_datadesc_type_t) xbt_set_get_by_id(gras_datadesc_set_local,
code);
- } CATCH(e) {
+ }
+ CATCH(e) {
if (e.category != not_found_error)
RETHROW;
xbt_ex_free(e);
@@
-119,16
+122,16
@@
gras_datadesc_scalar(const char *name,
gras_datadesc_type_t res;
long int arch;
- XBT_IN;
+ XBT_IN
("")
;
res = gras_datadesc_by_name_or_null(name);
if (res) {
- xbt_assert
1
(res->category_code == e_gras_datadesc_type_cat_scalar,
+ xbt_assert(res->category_code == e_gras_datadesc_type_cat_scalar,
"Redefinition of type %s does not match", name);
- xbt_assert
1
(res->category.scalar_data.encoding == encoding,
+ xbt_assert(res->category.scalar_data.encoding == encoding,
"Redefinition of type %s does not match", name);
- xbt_assert
1
(res->category.scalar_data.type == type,
+ xbt_assert(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);
@@
-143,7
+146,7
@@
gras_datadesc_scalar(const char *name,
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;
}
@@
-153,13
+156,13
@@
gras_datadesc_scalar(const char *name,
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 */
@@
-169,13
+172,13
@@
gras_datadesc_type_t gras_datadesc_struct(const char *name)
gras_datadesc_type_t res;
long int arch;
- XBT_IN
1
("(%s)", name);
+ XBT_IN("(%s)", name);
res = gras_datadesc_by_name_or_null(name);
if (res) {
/* FIXME: Check that field redefinition matches */
- xbt_assert
1
(res->category_code == e_gras_datadesc_type_cat_struct,
+ xbt_assert(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);
@@
-189,7
+192,7
@@
gras_datadesc_type_t gras_datadesc_struct(const char *name)
res->category.struct_data.fields =
xbt_dynar_new(sizeof(gras_dd_cat_field_t), gras_dd_cat_field_free);
- XBT_OUT;
+ XBT_OUT
()
;
return res;
}
@@
-203,26
+206,26
@@
gras_datadesc_struct_append(gras_datadesc_type_t struct_type,
gras_dd_cat_field_t field;
int arch;
- xbt_assert
2
(field_type,
+ xbt_assert(field_type,
"Cannot add the field '%s' into struct '%s': its type is NULL",
name, struct_type->name);
- XBT_IN
3
("(%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
+ XBT_DEBUG
("Ignoring request to add field to struct %s (closed. Redefinition?)",
struct_type->name);
return;
}
- xbt_assert
1
(field_type->size[GRAS_THISARCH] >= 0,
+ xbt_assert(field_type->size[GRAS_THISARCH] >= 0,
"Cannot add a dynamically sized field in structure %s",
struct_type->name);
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]);
@@
-245,18
+248,18
@@
gras_datadesc_struct_append(gras_datadesc_type_t struct_type,
xbt_dynar_push(struct_type->category.struct_data.fields, &field);
-
DEBUG3
("Push a %s into %s at offset %ld.",
+
XBT_DEBUG
("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
(" 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
@@
-266,12
+269,12
@@
gras_datadesc_struct_append(gras_datadesc_type_t struct_type,
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],
@@
-312,18
+315,18
@@
gras_datadesc_union(const char *name, gras_datadesc_type_cb_int_t selector)
gras_datadesc_type_t res;
int arch;
- XBT_IN
1
("(%s)", name);
- xbt_assert
0
(selector,
+ XBT_IN("(%s)", name);
+ xbt_assert(selector,
"Attempt to creat an union without field_count function");
res = gras_datadesc_by_name_or_null(name);
if (res) {
/* FIXME: Check that field redefinition matches */
- xbt_assert
1
(res->category_code == e_gras_datadesc_type_cat_union,
+ xbt_assert(res->category_code == e_gras_datadesc_type_cat_union,
"Redefinition of type %s does not match", name);
- xbt_assert
1
(res->category.union_data.selector == selector,
+ xbt_assert(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;
}
@@
-352,13
+355,13
@@
void gras_datadesc_union_append(gras_datadesc_type_t union_type,
gras_dd_cat_field_t field;
int arch;
- XBT_IN
3
("(%s %s.%s;)", field_type->name, union_type->name, name);
- xbt_assert
1
(field_type->size[GRAS_THISARCH] >= 0,
+ XBT_IN("(%s %s.%s;)", field_type->name, union_type->name, name);
+ xbt_assert(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;
}
@@
-418,22
+421,22
@@
gras_datadesc_ref(const char *name, gras_datadesc_type_t referenced_type)
gras_datadesc_by_name("data pointer");
int arch;
- XBT_IN
1
("(%s)", name);
+ XBT_IN("(%s)", name);
res = gras_datadesc_by_name_or_null(name);
if (res) {
- xbt_assert
1
(res->category_code == e_gras_datadesc_type_cat_ref,
+ xbt_assert(res->category_code == e_gras_datadesc_type_cat_ref,
"Redefinition of %s does not match", name);
- xbt_assert
1
(res->category.ref_data.type == referenced_type,
+ xbt_assert(res->category.ref_data.type == referenced_type,
"Redefinition of %s does not match", name);
- xbt_assert
1
(res->category.ref_data.selector == NULL,
+ xbt_assert(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;
}
res = gras_ddt_new(name);
- xbt_assert
0
(pointer_type, "Cannot get the description of data pointer");
+ xbt_assert(pointer_type, "Cannot get the description of data pointer");
for (arch = 0; arch < gras_arch_count; arch++) {
res->size[arch] = pointer_type->size[arch];
@@
-464,22
+467,22
@@
gras_datadesc_ref_generic(const char *name,
gras_datadesc_by_name("data pointer");
int arch;
- XBT_IN
1
("(%s)", name);
+ XBT_IN("(%s)", name);
res = gras_datadesc_by_name_or_null(name);
if (res) {
- xbt_assert
1
(res->category_code == e_gras_datadesc_type_cat_ref,
+ xbt_assert(res->category_code == e_gras_datadesc_type_cat_ref,
"Redefinition of type %s does not match", name);
- xbt_assert
1
(res->category.ref_data.type == NULL,
+ xbt_assert(res->category.ref_data.type == NULL,
"Redefinition of type %s does not match", name);
- xbt_assert
1
(res->category.ref_data.selector == selector,
+ xbt_assert(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);
- xbt_assert
0
(pointer_type, "Cannot get the description of data pointer");
+ xbt_assert(pointer_type, "Cannot get the description of data pointer");
for (arch = 0; arch < gras_arch_count; arch++) {
res->size[arch] = pointer_type->size[arch];
@@
-505,31
+508,31
@@
gras_datadesc_array_fixed(const char *name,
gras_datadesc_type_t res;
int arch;
- XBT_IN
1
("(%s)", name);
+ XBT_IN("(%s)", name);
res = gras_datadesc_by_name_or_null(name);
if (res) {
- xbt_assert
1
(res->category_code == e_gras_datadesc_type_cat_array,
+ xbt_assert(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
+ 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);
}
- xbt_assert
1
(res->category.array_data.fixed_size == fixed_size,
+ xbt_assert(res->category.array_data.fixed_size == fixed_size,
"Redefinition of type %s does not match", name);
- xbt_assert
1
(res->category.array_data.dynamic_size == NULL,
+ xbt_assert(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;
}
res = gras_ddt_new(name);
- xbt_assert
1
(fixed_size >= 0, "'%s' is a array of negative fixed size",
+ xbt_assert(fixed_size >= 0, "'%s' is a array of negative fixed size",
name);
for (arch = 0; arch < gras_arch_count; arch++) {
res->size[arch] = fixed_size * element_type->aligned_size[arch];
@@
-557,21
+560,21
@@
gras_datadesc_type_t gras_datadesc_array_dyn(const char *name,
gras_datadesc_type_t res;
int arch;
- XBT_IN
1
("(%s)", name);
- xbt_assert
1
(dynamic_size,
+ XBT_IN("(%s)", name);
+ xbt_assert(dynamic_size,
"'%s' is a dynamic array without size discriminant", name);
res = gras_datadesc_by_name_or_null(name);
if (res) {
- xbt_assert
1
(res->category_code == e_gras_datadesc_type_cat_array,
+ xbt_assert(res->category_code == e_gras_datadesc_type_cat_array,
"Redefinition of type %s does not match", name);
- xbt_assert
1
(res->category.array_data.type == element_type,
+ xbt_assert(res->category.array_data.type == element_type,
"Redefinition of type %s does not match", name);
- xbt_assert
1
(res->category.array_data.fixed_size == -1,
+ xbt_assert(res->category.array_data.fixed_size == -1,
"Redefinition of type %s does not match", name);
- xbt_assert
1
(res->category.array_data.dynamic_size == dynamic_size,
+ xbt_assert(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;
}
@@
-671,7
+674,7
@@
static void gras_datadesc_dynar_cb(gras_datadesc_type_t typedesc,
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;
@@
-694,7
+697,7
@@
gras_datadesc_dynar(gras_datadesc_type_t elm_t, void_f_pvoid_t free_func)
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);
@@
-724,7
+727,7
@@
gras_datadesc_dynar(gras_datadesc_type_t elm_t, void_f_pvoid_t free_func)
/* 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;
@@
-746,7
+749,7
@@
static void gras_datadesc_matrix_cb(gras_datadesc_type_t typedesc,
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];
}
@@
-758,7
+761,7
@@
gras_datadesc_matrix(gras_datadesc_type_t elm_t,
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",
@@
-783,7
+786,7
@@
gras_datadesc_matrix(gras_datadesc_type_t elm_t,
/* 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;
@@
-833,7
+836,7
@@
gras_dd_find_field(gras_datadesc_type_t type, const char *field_name)
} 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();
}
@@
-842,7
+845,7
@@
gras_dd_find_field(gras_datadesc_type_t type, const char *field_name)
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();
}
@@
-873,7
+876,7
@@
void gras_datadesc_cb_field_push(gras_datadesc_type_t type,
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;
@@
-884,7
+887,7
@@
void gras_datadesc_cb_field_push(gras_datadesc_type_t type,
} else if (!strcmp("unsigned long int", sub_type->name)) {
field->send = gras_datadesc_cb_push_ulint;
} else {
- ERROR1
+ XBT_ERROR
("Field %s is not an int, unsigned int, long int neither unsigned long int",
sub_type->name);
xbt_abort();
@@
-906,7
+909,7
@@
void gras_datadesc_cb_field_push_multiplier(gras_datadesc_type_t type,
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;
@@
-917,7
+920,7
@@
void gras_datadesc_cb_field_push_multiplier(gras_datadesc_type_t type,
} else if (!strcmp("unsigned long int", sub_type->name)) {
field->send = gras_datadesc_cb_push_ulint_mult;
} else {
- ERROR1
+ XBT_ERROR
("Field %s is not an int, unsigned int, long int neither unsigned long int",
sub_type->name);
xbt_abort();
@@
-943,7
+946,7
@@
void gras_datadesc_cb_field_recv(gras_datadesc_type_t type,
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:
@@
-989,35
+992,35
@@
int gras_datadesc_type_cmp(const gras_datadesc_type_t d1,
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
+ 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);
@@
-1026,20
+1029,20
@@
int gras_datadesc_type_cmp(const gras_datadesc_type_t d1,
}
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 */
}
@@
-1055,7
+1058,7
@@
int gras_datadesc_type_cmp(const gras_datadesc_type_t d1,
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));
@@
-1071,7
+1074,7
@@
int gras_datadesc_type_cmp(const gras_datadesc_type_t d1,
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;
}