X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b1acf7fe2f1886e9adcb4313f53548c9995a906c..4bb811f3af19a18cba0a0122f320d900e5933da0:/src/gras/DataDesc/ddt_create.c diff --git a/src/gras/DataDesc/ddt_create.c b/src/gras/DataDesc/ddt_create.c index 61b371b40c..543ae354f4 100644 --- a/src/gras/DataDesc/ddt_create.c +++ b/src/gras/DataDesc/ddt_create.c @@ -10,18 +10,18 @@ #include "DataDesc/datadesc_private.h" -GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(new,DataDesc); +GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(create,datadesc); /** * gras_ddt_freev: * * gime that memory back, dude. I mean it. */ -static void gras_ddt_freev(void *ddt) { +void gras_ddt_freev(void *ddt) { gras_datadesc_type_t *type= (gras_datadesc_type_t *)ddt; if (type) { - gras_ddt_free(&type); + gras_datadesc_unref(type); } } @@ -30,17 +30,20 @@ gras_ddt_new(const char *name, gras_datadesc_type_t **dst) { gras_error_t errcode; - gras_datadesc_type_t *res=malloc(sizeof(gras_datadesc_type_t)); + gras_datadesc_type_t *res; + + res=malloc(sizeof(gras_datadesc_type_t)); if (!res) RAISE_MALLOC; memset(res, 0, sizeof(gras_datadesc_type_t)); res->name = strdup(name); res->name_len = strlen(name); + res->refcounter = 1; TRY(gras_set_add(gras_datadesc_set_local, (gras_set_elm_t*)res,&gras_ddt_freev)); - + *dst=res; return no_error; } @@ -50,10 +53,16 @@ gras_ddt_new(const char *name, * * Retrieve a type from its name */ -gras_error_t gras_datadesc_by_name(const char *name, - gras_datadesc_type_t **type) { - return gras_set_get_by_name(gras_datadesc_set_local, - name,(gras_set_elm_t**)type); +gras_datadesc_type_t *gras_datadesc_by_name(const char *name) { + + gras_datadesc_type_t *type; + + if (gras_set_get_by_name(gras_datadesc_set_local, + name,(gras_set_elm_t**)&type) == no_error) { + return type; + } else { + return NULL; + } } /** @@ -89,19 +98,19 @@ gras_datadesc_declare_scalar(const char *name, for (arch = 0; arch < gras_arch_count; arch ++) { long int sz; long int mask; + res->size[arch] = gras_arches[arch].sizeof_scalars[type]; - res->size[arch] = gras_arch_sizes[arch].sizeof_scalars[type]; - 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 */ - + /* 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 */ @@ -110,7 +119,7 @@ gras_datadesc_declare_scalar(const char *name, gras_assert0(res->alignment[arch] != 0, "scalar type too large"); - res->aligned_size[arch] = aligned(res->size[arch], res->alignment[arch]); + res->aligned_size[arch] = aligned(res->size[arch], res->alignment[arch]); gras_assert0 (res->aligned_size[arch] >= 0, "scalar type too large"); @@ -119,13 +128,6 @@ gras_datadesc_declare_scalar(const char *name, res->alignment[arch] = res->size[arch]; res->aligned_size[arch] = res->size[arch]; } - - /* FIXME size < 0 sometimes? - } else { - res->alignment = 0; - res->aligned_size = 0; - } - */ } res->category_code = e_gras_datadesc_type_cat_scalar; @@ -142,7 +144,7 @@ gras_datadesc_declare_scalar(const char *name, * Frees one struct or union field */ void gras_dd_cat_field_free(void *f) { - gras_dd_cat_field_t *field = (gras_dd_cat_field_t *)f; + gras_dd_cat_field_t *field = *(gras_dd_cat_field_t **)f; if (field) { if (field->name) free(field->name); @@ -167,11 +169,11 @@ gras_datadesc_declare_struct(const char *name, res=*dst; for (arch=0; archsize[arch] = 0; - res->alignment[arch] = 0; - res->aligned_size[arch] = 0; + res->size[arch] = 0; + res->alignment[arch] = 0; + res->aligned_size[arch] = 0; } - res->category_code = e_gras_datadesc_type_cat_struct; + res->category_code = e_gras_datadesc_type_cat_struct; TRY(gras_dynar_new(&(res->category.struct_data.fields), sizeof(gras_dd_cat_field_t*), &gras_dd_cat_field_free)); @@ -179,37 +181,26 @@ gras_datadesc_declare_struct(const char *name, return no_error; } -gras_error_t -gras_datadesc_declare_struct_append_name(gras_datadesc_type_t *struct_type, - const char *name, - const char *field_type_name){ - gras_error_t errcode; - gras_datadesc_type_t *field_type; - - errcode = gras_datadesc_by_name(field_type_name, &field_type); - if (errcode != no_error) { - WARN2("Got error '%s' while looking for '%s'", - gras_error_name(errcode), field_type_name); - return errcode; - } - return gras_datadesc_declare_struct_append(struct_type,name,field_type); -} /** * gras_datadesc_declare_struct_append: * * Append a field to the struct */ gras_error_t -gras_datadesc_declare_struct_append(gras_datadesc_type_t *struct_type, - const char *name, - gras_datadesc_type_t *field_type) { +gras_datadesc_declare_struct_append(gras_datadesc_type_t *struct_type, + const char *name, + gras_datadesc_type_t *field_type) { gras_error_t errcode; gras_dd_cat_field_t *field; int arch; - - gras_assert0(field_type->size >= 0, - "Cannot add a dynamically sized field in a structure"); + + gras_assert1(!struct_type->category.struct_data.closed, + "Cannot add anything to the already closed struct %s", + struct_type->name); + gras_assert1(field_type->size >= 0, + "Cannot add a dynamically sized field in structure %s", + struct_type->name); field=malloc(sizeof(gras_dd_cat_field_t)); if (!field) @@ -217,8 +208,24 @@ gras_datadesc_declare_struct_append(gras_datadesc_type_t *struct_type field->name = strdup(name); + DEBUG0("----------------"); + DEBUG4("PRE s={size=%d,align=%d,asize=%d} struct_boundary=%d", + struct_type->size[GRAS_THISARCH], + struct_type->alignment[GRAS_THISARCH], + struct_type->aligned_size[GRAS_THISARCH], + gras_arches[GRAS_THISARCH].struct_boundary); + + for (arch=0; archoffset[arch] = aligned(struct_type->size[arch], field_type->alignment[arch]); + field->offset[arch] = aligned(struct_type->size[arch], + min(field_type->alignment[arch], + gras_arches[arch].struct_boundary)); + + struct_type->size[arch] = field->offset[arch] + field_type->size[arch]; + struct_type->alignment[arch] = max(struct_type->alignment[arch], + field_type->alignment[arch]); + struct_type->aligned_size[arch] = aligned(struct_type->size[arch], + struct_type->alignment[arch]); } field->code = field_type->code; field->pre = NULL; @@ -226,14 +233,23 @@ gras_datadesc_declare_struct_append(gras_datadesc_type_t *struct_type TRY(gras_dynar_push(struct_type->category.struct_data.fields, &field)); - for (arch=0; archsize[arch] = field->offset[arch] + field_type->size[arch]; - struct_type->alignment[arch] = max(struct_type->alignment[arch], field_type->alignment[arch]); - struct_type->aligned_size[arch] = aligned(struct_type->size[arch], struct_type->alignment[arch]); - } - + DEBUG3("Push a %s into %s at offset %d.", + field_type->name, struct_type->name,field->offset[GRAS_THISARCH]); + DEBUG3(" f={size=%d,align=%d,asize=%d}", + field_type->size[GRAS_THISARCH], + field_type->alignment[GRAS_THISARCH], + field_type->aligned_size[GRAS_THISARCH]); + DEBUG3(" s={size=%d,align=%d,asize=%d}", + struct_type->size[GRAS_THISARCH], + struct_type->alignment[GRAS_THISARCH], + struct_type->aligned_size[GRAS_THISARCH]); return no_error; } +void +gras_datadesc_declare_struct_close(gras_datadesc_type_t *struct_type) { + struct_type->category.struct_data.closed = 1; + // INFO0("FIXME: Do something in gras_datadesc_declare_struct_close"); +} /** * gras_datadesc_declare_union: @@ -241,9 +257,9 @@ gras_datadesc_declare_struct_append(gras_datadesc_type_t *struct_type * Create a new union and give a pointer to it */ gras_error_t -gras_datadesc_declare_union(const char *name, - gras_datadesc_type_cb_int_t selector, - gras_datadesc_type_t **dst) { +gras_datadesc_declare_union(const char *name, + gras_datadesc_type_cb_int_t selector, + gras_datadesc_type_t **dst) { gras_error_t errcode; gras_datadesc_type_t *res; @@ -256,10 +272,11 @@ gras_datadesc_declare_union(const char *name, res=*dst; for (arch=0; archsize[arch] = 0; - res->alignment[arch] = 0; - res->aligned_size[arch] = 0; + res->size[arch] = 0; + res->alignment[arch] = 0; + res->aligned_size[arch] = 0; } + res->category_code = e_gras_datadesc_type_cat_union; TRY(gras_dynar_new(&(res->category.union_data.fields), sizeof(gras_dd_cat_field_t*), @@ -275,16 +292,20 @@ gras_datadesc_declare_union(const char *name, * Append a field to the union */ gras_error_t -gras_datadesc_declare_union_append(gras_datadesc_type_t *union_type, - const char *name, - gras_datadesc_type_t *field_type) { +gras_datadesc_declare_union_append(gras_datadesc_type_t *union_type, + const char *name, + gras_datadesc_type_t *field_type) { gras_error_t errcode; gras_dd_cat_field_t *field; int arch; - gras_assert0(field_type->size >= 0, - "Cannot add a dynamically sized field in an union"); + gras_assert1(!union_type->category.union_data.closed, + "Cannot add anything to the already closed union %s", + union_type->name); + gras_assert1(field_type->size >= 0, + "Cannot add a dynamically sized field in union %s", + union_type->name); field=malloc(sizeof(gras_dd_cat_field_t)); if (!field) @@ -301,14 +322,21 @@ gras_datadesc_declare_union_append(gras_datadesc_type_t *union_type, TRY(gras_dynar_push(union_type->category.union_data.fields, &field)); for (arch=0; archsize[arch] = max(union_type->size[arch], field_type->size[arch]); - union_type->alignment[arch] = max(union_type->alignment[arch], field_type->alignment[arch]); - union_type->aligned_size[arch] = aligned(union_type->size[arch], union_type->alignment[arch]); + union_type->size[arch] = max(union_type->size[arch], + field_type->size[arch]); + union_type->alignment[arch] = max(union_type->alignment[arch], + field_type->alignment[arch]); + union_type->aligned_size[arch] = aligned(union_type->size[arch], + union_type->alignment[arch]); } - return no_error; } +void +gras_datadesc_declare_union_close(gras_datadesc_type_t *union_type) { + union_type->category.union_data.closed = 1; + // INFO0("FIXME: Do something in gras_datadesc_declare_union_close"); +} /** * gras_datadesc_declare_ref: * @@ -321,18 +349,18 @@ gras_datadesc_declare_ref(const char *name, gras_error_t errcode; gras_datadesc_type_t *res; - gras_datadesc_type_t *pointer_type; + gras_datadesc_type_t *pointer_type = gras_datadesc_by_name("data pointer"); int arch; TRY(gras_ddt_new(name,dst)); res=*dst; - TRY(gras_datadesc_by_name("data pointer", &pointer_type)); + gras_assert0(pointer_type, "Cannot get the description of data pointer"); - for (arch=0; archsize[arch] = pointer_type->size[arch]; - res->alignment[arch] = pointer_type->alignment[arch]; - res->aligned_size[arch] = pointer_type->aligned_size[arch]; + for (arch=0; archsize[arch] = pointer_type->size[arch]; + res->alignment[arch] = pointer_type->alignment[arch]; + res->aligned_size[arch] = pointer_type->aligned_size[arch]; } res->category_code = e_gras_datadesc_type_cat_ref; @@ -354,18 +382,18 @@ gras_datadesc_declare_ref_generic(const char *name, gras_error_t errcode; gras_datadesc_type_t *res; - gras_datadesc_type_t *pointer_type; + gras_datadesc_type_t *pointer_type = gras_datadesc_by_name("data pointer"); int arch; TRY(gras_ddt_new(name,dst)); res=*dst; - TRY(gras_datadesc_by_name("data pointer", &pointer_type)); + gras_assert0(pointer_type, "Cannot get the description of data pointer"); for (arch=0; archsize[arch] = pointer_type->size[arch]; - res->alignment[arch] = pointer_type->alignment[arch]; - res->aligned_size[arch] = pointer_type->aligned_size[arch]; + res->size[arch] = pointer_type->size[arch]; + res->alignment[arch] = pointer_type->alignment[arch]; + res->aligned_size[arch] = pointer_type->aligned_size[arch]; } res->category_code = e_gras_datadesc_type_cat_ref; @@ -382,10 +410,10 @@ gras_datadesc_declare_ref_generic(const char *name, * Create a new array and give a pointer to it */ gras_error_t -gras_datadesc_declare_array_fixed(const char *name, - gras_datadesc_type_t *element_type, - long int fixed_size, - gras_datadesc_type_t **dst) { +gras_datadesc_declare_array_fixed(const char *name, + gras_datadesc_type_t *element_type, + long int fixed_size, + gras_datadesc_type_t **dst) { gras_error_t errcode; gras_datadesc_type_t *res; @@ -397,9 +425,10 @@ gras_datadesc_declare_array_fixed(const char *name, gras_assert1(fixed_size > 0, "'%s' is a array of negative fixed size",name); for (arch=0; archsize[arch] = fixed_size * element_type->aligned_size[arch]; - res->alignment[arch] = element_type->alignment[arch]; - res->aligned_size[arch] = fixed_size; /*FIXME: That was so in GS, but looks stupid*/ - } + res->alignment[arch] = element_type->alignment[arch]; + res->aligned_size[arch] = res->size[arch]; + } + res->category_code = e_gras_datadesc_type_cat_array; res->category.array_data.code = element_type->code; @@ -432,9 +461,10 @@ gras_datadesc_declare_array_dyn(const char *name, for (arch=0; archsize[arch] = -1; /* make sure it indicates "dynamic" */ - res->alignment[arch] = element_type->alignment[arch]; - res->aligned_size[arch] = -1; /*FIXME: That was so in GS, but looks stupid*/ + res->alignment[arch] = element_type->alignment[arch]; + res->aligned_size[arch] = -1; /*FIXME: That was so in GS, but looks stupid*/ } + res->category_code = e_gras_datadesc_type_cat_array; res->category.array_data.code = element_type->code; @@ -444,19 +474,6 @@ gras_datadesc_declare_array_dyn(const char *name, return no_error; } -/** - * gras_datadesc_declare_parse: - * - * Create a datadescription from the result of parsing the C type description - */ -gras_error_t -gras_datadesc_parse(const char *name, - const char *C_statement, - gras_datadesc_type_t **dst) { - RAISE_UNIMPLEMENTED; -} - - gras_error_t gras_datadesc_import_nws(const char *name, const DataDescriptor *desc, @@ -466,18 +483,48 @@ gras_datadesc_import_nws(const char *name, } /** - * gras_ddt_free: + * gras_datadesc_cb_set_pre: * - * Frees a datadescription. + * Add a pre-send callback to this datadexc */ -void gras_ddt_free(gras_datadesc_type_t **type) { - gras_datadesc_type_t *t; +void gras_datadesc_cb_set_pre (gras_datadesc_type_t *type, + gras_datadesc_type_cb_void_t pre) { + type->pre = pre; +} +/** + * gras_datadesc_cb_set_post: + * + * Add a post-send callback to this datadexc + */ +void gras_datadesc_cb_set_post(gras_datadesc_type_t *type, + gras_datadesc_type_cb_void_t post) { + type->post = post; +} - if (type && *type) { - t=*type; +/** + * gras_datadesc_ref: + * + * Adds a reference to the datastruct. + * ddt will be freed only when the refcount becomes 0. + */ +void gras_datadesc_ref(gras_datadesc_type_t *type) { + type->refcounter ++; +} - free(t->name); - switch (t->category_code) { +/** + * gras_datadesc_unref: + * + * Adds a reference to the datastruct. + * ddt will be freed only when the refcount becomes 0. + */ +void gras_datadesc_unref(gras_datadesc_type_t *type) { + type->refcounter--; + if (!type->refcounter) { + /* even the set of ddt released that type. Let's free it */ + DEBUG1("Let's free ddt %s",type->name); + + free(type->name); + switch (type->category_code) { case e_gras_datadesc_type_cat_scalar: case e_gras_datadesc_type_cat_ref: case e_gras_datadesc_type_cat_array: @@ -485,41 +532,24 @@ void gras_ddt_free(gras_datadesc_type_t **type) { break; case e_gras_datadesc_type_cat_ignored: - if (t->category.ignored_data.free_func) { - t->category.ignored_data.free_func(t->category.ignored_data.default_value); + if (type->category.ignored_data.free_func) { + type->category.ignored_data.free_func + (type->category.ignored_data.default_value); } break; case e_gras_datadesc_type_cat_struct: - gras_dynar_free(t->category.struct_data.fields); + gras_dynar_free(type->category.struct_data.fields); break; case e_gras_datadesc_type_cat_union: - gras_dynar_free(t->category.union_data.fields); + gras_dynar_free(type->category.union_data.fields); break; default: /* datadesc was invalid. Killing it is like euthanasy, I guess */ break; } + free(type); } } - -/** - * gras_datadesc_cb_set_pre: - * - * Add a pre-send callback to this datadexc - */ -void gras_datadesc_cb_set_pre (gras_datadesc_type_t *type, - gras_datadesc_type_cb_void_t pre) { - type->pre = pre; -} -/** - * gras_datadesc_cb_set_post: - * - * Add a post-send callback to this datadexc - */ -void gras_datadesc_cb_set_post(gras_datadesc_type_t *type, - gras_datadesc_type_cb_void_t post) { - type->post = post; -}