/* ddt_new - creation/deletion of datatypes structs (private to this module)*/
-/* Authors: Olivier Aumage, Martin Quinson */
-/* Copyright (C) 2003, 2004 the GRAS posse. */
+/* Copyright (c) 2003 Olivier Aumage. */
+/* Copyright (c) 2003, 2004 Martin Quinson. */
+/* 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/misc.h" /* min()/max() */
#include "gras/DataDesc/datadesc_private.h"
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_create,datadesc,"Creating new datadescriptions");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_create,datadesc,"Creating new datadescriptions");
/**
* gras_ddt_freev:
}
static gras_datadesc_type_t gras_ddt_new(const char *name) {
- gras_error_t errcode;
gras_datadesc_type_t res;
- GRAS_IN1("(%s)",name);
- res=gras_new0(s_gras_datadesc_type_t,1);
+ XBT_IN1("(%s)",name);
+ res=xbt_new0(s_gras_datadesc_type_t,1);
res->name = (char*)strdup(name);
res->name_len = strlen(name);
res->cycle = 0;
- gras_set_add(gras_datadesc_set_local,
- (gras_set_elm_t)res,&gras_ddt_freev);
- GRAS_OUT;
+ xbt_set_add(gras_datadesc_set_local,
+ (xbt_set_elm_t)res,&gras_ddt_freev);
+ XBT_OUT;
return res;
}
gras_datadesc_type_t type;
- GRAS_IN1("(%s)",name);
- if (gras_set_get_by_name(gras_datadesc_set_local,
- name,(gras_set_elm_t*)&type) == no_error) {
- GRAS_OUT;
+ XBT_IN1("(%s)",name);
+ if (xbt_set_get_by_name(gras_datadesc_set_local,
+ name,(xbt_set_elm_t*)&type) == no_error) {
+ XBT_OUT;
return type;
} else {
- GRAS_OUT;
+ XBT_OUT;
return NULL;
}
}
*
* Retrieve a type from its code
*/
-gras_error_t gras_datadesc_by_id(long int code,
+xbt_error_t gras_datadesc_by_id(long int code,
gras_datadesc_type_t *type) {
- GRAS_IN;
- return gras_set_get_by_id(gras_datadesc_set_local,
- code,(gras_set_elm_t*)type);
+ XBT_IN;
+ return xbt_set_get_by_id(gras_datadesc_set_local,
+ code,(xbt_set_elm_t*)type);
}
/**
gras_datadesc_type_t res;
long int arch;
- GRAS_IN;
+ XBT_IN;
res = gras_datadesc_by_name(name);
if (res) {
- gras_assert1(res->category_code == e_gras_datadesc_type_cat_scalar,
+ xbt_assert1(res->category_code == e_gras_datadesc_type_cat_scalar,
"Redefinition of type %s does not match", name);
- gras_assert1(res->category.scalar_data.encoding == encoding,
+ xbt_assert1(res->category.scalar_data.encoding == encoding,
"Redefinition of type %s does not match", name);
- gras_assert1(res->category.scalar_data.type == type,
+ xbt_assert1(res->category.scalar_data.type == type,
"Redefinition of type %s does not match", name);
VERB1("Discarding redefinition of %s",name);
return res;
res = gras_ddt_new(name);
for (arch = 0; arch < gras_arch_count; arch ++) {
- long int sz;
- long int mask;
res->size[arch] = gras_arches[arch].sizeofs[type];
res->alignment[arch] = gras_arches[arch].boundaries[type];
res->aligned_size[arch] = aligned(res->size[arch], res->alignment[arch]);
-/* FIXME: kill the following after discution with Oli */
-#if 0
- sz = res->size[arch];
- mask = sz;
-
- /* just in case you wonder, x>>1 == x/2 on all architectures when x>=0
- and a size is always>=0 */
-
- /* make sure mask have all the bits under the biggest one of size set to 1
- Example: size=000100101 => mask=0000111111 */
- while ((sz >>= 1)) {
- mask |= sz;
- }
-
- if (res->size[arch] & (mask >> 1)) { /* if size have bits to one beside its biggest */
- /* size is not a power of 2 */
- /* alignment= next power of 2 after size */
- res->alignment[arch] = (res->size[arch] & ~(mask >> 1)) << 1;
- gras_assert0(res->alignment[arch] != 0,
- "scalar type too large");
-
- res->aligned_size[arch] = aligned(res->size[arch], res->alignment[arch]);
- gras_assert0 (res->aligned_size[arch] >= 0,
- "scalar type too large");
-
- } else {
- /* size is a power of 2, life is great */
- res->alignment[arch] = res->size[arch];
- res->aligned_size[arch] = res->size[arch];
- }
-#endif
}
res->category_code = e_gras_datadesc_type_cat_scalar;
res->category.scalar_data.encoding = encoding;
res->category.scalar_data.type = type;
- GRAS_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;
- GRAS_IN;
+ XBT_IN;
if (field) {
if (field->name)
- gras_free(field->name);
- gras_free(field);
+ xbt_free(field->name);
+ xbt_free(field);
}
- GRAS_OUT;
+ XBT_OUT;
}
/**
gras_datadesc_type_t
gras_datadesc_struct(const char *name) {
- gras_error_t errcode;
gras_datadesc_type_t res;
long int arch;
- GRAS_IN1("(%s)",name);
+ XBT_IN1("(%s)",name);
res = gras_datadesc_by_name(name);
if (res) {
/* FIXME: Check that field redefinition matches */
- gras_assert1(res->category_code == e_gras_datadesc_type_cat_struct,
+ 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);
return res;
}
res->category_code = e_gras_datadesc_type_cat_struct;
res->category.struct_data.fields =
- gras_dynar_new(sizeof(gras_dd_cat_field_t),
+ xbt_dynar_new(sizeof(gras_dd_cat_field_t),
&gras_dd_cat_field_free);
- GRAS_OUT;
+ XBT_OUT;
return res;
}
const char *name,
gras_datadesc_type_t field_type) {
- gras_error_t errcode;
gras_dd_cat_field_t field;
int arch;
- gras_assert2(field_type,
+ xbt_assert2(field_type,
"Cannot add the field '%s' into struct '%s': its type is NULL. Typo in get_by_name?",
name,struct_type->name);
- GRAS_IN3("(%s %s.%s;)",field_type->name,struct_type->name,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);
return;
}
- gras_assert1(field_type->size != 0,
+ xbt_assert1(field_type->size != 0,
"Cannot add a dynamically sized field in structure %s",
struct_type->name);
- field=gras_new(s_gras_dd_cat_field_t,1);
+ field=xbt_new(s_gras_dd_cat_field_t,1);
field->name = (char*)strdup(name);
DEBUG0("----------------");
field->pre = NULL;
field->post = NULL;
- gras_dynar_push(struct_type->category.struct_data.fields, &field);
+ 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]);
struct_type->size[GRAS_THISARCH],
struct_type->alignment[GRAS_THISARCH],
struct_type->aligned_size[GRAS_THISARCH]);
- GRAS_OUT;
+ XBT_OUT;
}
void
gras_datadesc_struct_close(gras_datadesc_type_t struct_type) {
- GRAS_IN;
+ XBT_IN;
struct_type->category.struct_data.closed = 1;
+ DEBUG4("structure %s closed. size=%ld,align=%ld,asize=%ld",
+ struct_type->name,
+ struct_type->size[GRAS_THISARCH],
+ struct_type->alignment[GRAS_THISARCH],
+ struct_type->aligned_size[GRAS_THISARCH]);
}
/**
gras_datadesc_union(const char *name,
gras_datadesc_type_cb_int_t selector) {
- gras_error_t errcode;
gras_datadesc_type_t res;
int arch;
- GRAS_IN1("(%s)",name);
- gras_assert0(selector,
+ XBT_IN1("(%s)",name);
+ xbt_assert0(selector,
"Attempt to creat an union without field_count function");
res = gras_datadesc_by_name(name);
if (res) {
/* FIXME: Check that field redefinition matches */
- gras_assert1(res->category_code == e_gras_datadesc_type_cat_union,
+ xbt_assert1(res->category_code == e_gras_datadesc_type_cat_union,
"Redefinition of type %s does not match", name);
- gras_assert1(res->category.union_data.selector == selector,
+ xbt_assert1(res->category.union_data.selector == selector,
"Redefinition of type %s does not match", name);
VERB1("Discarding redefinition of %s",name);
return res;
res->category_code = e_gras_datadesc_type_cat_union;
res->category.union_data.fields =
- gras_dynar_new(sizeof(gras_dd_cat_field_t*),
+ xbt_dynar_new(sizeof(gras_dd_cat_field_t*),
&gras_dd_cat_field_free);
res->category.union_data.selector = selector;
gras_dd_cat_field_t field;
int arch;
- GRAS_IN3("(%s %s.%s;)",field_type->name,union_type->name,name);
- gras_assert1(field_type->size != 0,
+ XBT_IN3("(%s %s.%s;)",field_type->name,union_type->name,name);
+ xbt_assert1(field_type->size != 0,
"Cannot add a dynamically sized field in union %s",
union_type->name);
return;
}
- field=gras_new0(s_gras_dd_cat_field_t,1);
+ field=xbt_new0(s_gras_dd_cat_field_t,1);
field->name = (char*)strdup(name);
field->type = field_type;
/* All offset are left to 0 in an union */
- gras_dynar_push(union_type->category.union_data.fields, &field);
+ xbt_dynar_push(union_type->category.union_data.fields, &field);
for (arch=0; arch<gras_arch_count; arch ++) {
union_type->size[arch] = max(union_type->size[arch],
gras_datadesc_ref(const char *name,
gras_datadesc_type_t referenced_type) {
- gras_error_t errcode;
gras_datadesc_type_t res;
gras_datadesc_type_t pointer_type = gras_datadesc_by_name("data pointer");
int arch;
- GRAS_IN1("(%s)",name);
+ XBT_IN1("(%s)",name);
res = gras_datadesc_by_name(name);
if (res) {
- gras_assert1(res->category_code == e_gras_datadesc_type_cat_ref,
+ xbt_assert1(res->category_code == e_gras_datadesc_type_cat_ref,
"Redefinition of %s does not match",name);
- gras_assert1(res->category.ref_data.type == referenced_type,
+ xbt_assert1(res->category.ref_data.type == referenced_type,
"Redefinition of %s does not match",name);
- gras_assert1(res->category.ref_data.selector == NULL,
+ xbt_assert1(res->category.ref_data.selector == NULL,
"Redefinition of %s does not match",name);
VERB1("Discarding redefinition of %s",name);
return res;
res = gras_ddt_new(name);
- gras_assert0(pointer_type, "Cannot get the description of data pointer");
+ xbt_assert0(pointer_type, "Cannot get the description of data pointer");
for (arch=0; arch<gras_arch_count; arch ++){
res->size[arch] = pointer_type->size[arch];
gras_datadesc_type_t pointer_type = gras_datadesc_by_name("data pointer");
int arch;
- GRAS_IN1("(%s)",name);
+ XBT_IN1("(%s)",name);
res = gras_datadesc_by_name(name);
if (res) {
- gras_assert1(res->category_code == e_gras_datadesc_type_cat_ref,
+ xbt_assert1(res->category_code == e_gras_datadesc_type_cat_ref,
"Redefinition of type %s does not match", name);
- gras_assert1(res->category.ref_data.type == NULL,
+ xbt_assert1(res->category.ref_data.type == NULL,
"Redefinition of type %s does not match", name);
- gras_assert1(res->category.ref_data.selector == selector,
+ xbt_assert1(res->category.ref_data.selector == selector,
"Redefinition of type %s does not match", name);
VERB1("Discarding redefinition of %s",name);
return res;
}
res = gras_ddt_new(name);
- gras_assert0(pointer_type, "Cannot get the description of data pointer");
+ xbt_assert0(pointer_type, "Cannot get the description of data pointer");
for (arch=0; arch<gras_arch_count; arch ++) {
res->size[arch] = pointer_type->size[arch];
gras_datadesc_type_t res;
int arch;
- GRAS_IN1("(%s)",name);
+ XBT_IN1("(%s)",name);
res = gras_datadesc_by_name(name);
if (res) {
- gras_assert1(res->category_code == e_gras_datadesc_type_cat_array,
+ xbt_assert1(res->category_code == e_gras_datadesc_type_cat_array,
"Redefinition of type %s does not match", name);
- gras_assert1(res->category.array_data.type == element_type,
+ xbt_assert1(res->category.array_data.type == element_type,
"Redefinition of type %s does not match", name);
- gras_assert1(res->category.array_data.fixed_size == fixed_size,
+ xbt_assert1(res->category.array_data.fixed_size == fixed_size,
"Redefinition of type %s does not match", name);
- gras_assert1(res->category.array_data.dynamic_size == NULL,
+ xbt_assert1(res->category.array_data.dynamic_size == NULL,
"Redefinition of type %s does not match", name);
VERB1("Discarding redefinition of %s",name);
}
res = gras_ddt_new(name);
- gras_assert1(fixed_size > 0, "'%s' is a array of null fixed size",name);
+ xbt_assert1(fixed_size > 0, "'%s' is a array of null fixed size",name);
for (arch=0; arch<gras_arch_count; arch ++) {
res->size[arch] = fixed_size * element_type->aligned_size[arch];
res->alignment[arch] = element_type->alignment[arch];
gras_datadesc_type_t res;
int arch;
- GRAS_IN1("(%s)",name);
- gras_assert1(dynamic_size,
+ XBT_IN1("(%s)",name);
+ xbt_assert1(dynamic_size,
"'%s' is a dynamic array without size discriminant",
name);
res = gras_datadesc_by_name(name);
if (res) {
- gras_assert1(res->category_code == e_gras_datadesc_type_cat_array,
+ xbt_assert1(res->category_code == e_gras_datadesc_type_cat_array,
"Redefinition of type %s does not match", name);
- gras_assert1(res->category.array_data.type == element_type,
+ xbt_assert1(res->category.array_data.type == element_type,
"Redefinition of type %s does not match", name);
- gras_assert1(res->category.array_data.fixed_size == 0,
+ xbt_assert1(res->category.array_data.fixed_size == 0,
"Redefinition of type %s does not match", name);
- gras_assert1(res->category.array_data.dynamic_size == dynamic_size,
+ xbt_assert1(res->category.array_data.dynamic_size == dynamic_size,
"Redefinition of type %s does not match", name);
VERB1("Discarding redefinition of %s",name);
gras_datadesc_ref_pop_arr(gras_datadesc_type_t element_type) {
gras_datadesc_type_t res;
- char *name=(char*)gras_malloc(strlen(element_type->name) + 4);
+ char *name=(char*)xbt_malloc(strlen(element_type->name) + 4);
sprintf(name,"%s[]",element_type->name);
sprintf(name,"%s[]*",element_type->name);
res = gras_datadesc_ref(name,res);
- gras_free(name);
+ xbt_free(name);
return res;
}
-gras_error_t
+xbt_error_t
gras_datadesc_import_nws(const char *name,
const DataDescriptor *desc,
unsigned long howmany,
static gras_datadesc_type_t
gras_dd_find_field(gras_datadesc_type_t type,
const char *field_name) {
- gras_datadesc_type_t sub_type=NULL;
- gras_dynar_t field_array;
+ xbt_dynar_t field_array;
gras_dd_cat_field_t field=NULL;
int field_num;
field_array = type->category.struct_data.fields;
} else {
ERROR2("%s (%p) is not a struct nor an union. There is no field.", type->name,(void*)type);
- gras_abort();
+ xbt_abort();
}
- gras_dynar_foreach(field_array,field_num,field) {
+ xbt_dynar_foreach(field_array,field_num,field) {
if (!strcmp(field_name,field->name)) {
return field->type;
}
}
ERROR2("No field nammed %s in %s",field_name,type->name);
- gras_abort();
+ xbt_abort();
}
} else {
ERROR1("Field %s is not an int, unsigned int, long int neither unsigned long int",
sub_type->name);
- gras_abort();
+ xbt_abort();
}
}
/**
/**
* gras_datadesc_free:
*
- * Free a datadesc. Should only be called at gras_exit.
+ * Free a datadesc. Should only be called at xbt_exit.
*/
void gras_datadesc_free(gras_datadesc_type_t *type) {
break;
case e_gras_datadesc_type_cat_struct:
- gras_dynar_free(&( (*type)->category.struct_data.fields ));
+ xbt_dynar_free(&( (*type)->category.struct_data.fields ));
break;
case e_gras_datadesc_type_cat_union:
- gras_dynar_free(&( (*type)->category.union_data.fields ));
+ xbt_dynar_free(&( (*type)->category.union_data.fields ));
break;
default:
/* datadesc was invalid. Killing it is like euthanasy, I guess */
break;
}
- gras_free((*type)->name);
- gras_free(*type);
+ xbt_free((*type)->name);
+ xbt_free(*type);
type=NULL;
}
+
+/**
+ * gras_datadesc_type_cmp:
+ *
+ * Compares two datadesc types with the same semantic than strcmp.
+ *
+ * This comparison does not take the set headers into account (name and ID),
+ * but only the payload (actual type description).
+ */
+int gras_datadesc_type_cmp(const gras_datadesc_type_t d1,
+ const gras_datadesc_type_t d2) {
+ int ret,cpt;
+ gras_dd_cat_field_t field1,field2;
+ gras_datadesc_type_t field_desc_1,field_desc_2;
+
+ if (d1 == d2) return 0; /* easy optimization */
+
+ if (!d1 && d2) {
+ DEBUG0("ddt_cmp: !d1 && d2 => 1");
+ return 1;
+ }
+ if (!d1 && !d2) {
+ DEBUG0("ddt_cmp: !d1 && !d2 => 0");
+ return 0;
+ }
+ if ( d1 && !d2) {
+ DEBUG0("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)",
+ 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)",
+ 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);
+ 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",
+ 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",
+ 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",
+ d1->name,(void*)d1->recv, d2->name,(void*)d2->recv);
+ return 1; /* ISO C forbids ordered comparisons of pointers to functions */
+ }
+
+ switch (d1->category_code) {
+ case e_gras_datadesc_type_cat_scalar:
+ if (d1->category.scalar_data.encoding != d2->category.scalar_data.encoding)
+ return d1->category.scalar_data.encoding > 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)",
+ 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_foreach(d1->category.struct_data.fields, cpt, field1) {
+
+ field2 = 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",
+ 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)
+ 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_foreach(d1->category.union_data.fields, cpt, field1) {
+
+ field2 = 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);
+ if (ret)
+ return ret;
+
+ }
+ break;
+
+
+ case e_gras_datadesc_type_cat_ref:
+ if (d1->category.ref_data.selector != d2->category.ref_data.selector)
+ 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;
+ 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;
+
+ 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;
+
+ if (d1->category.array_data.dynamic_size != d2->category.array_data.dynamic_size)
+ return 1; /* ISO C forbids ordered comparisons of pointers to functions */
+
+ break;
+
+ case e_gras_datadesc_type_cat_ignored:
+ /* That's ignored... */
+ default:
+ /* two stupidly created ddt are equally stupid ;) */
+ break;
+ }
+ return 0;
+
+}
