#include "DataDesc/datadesc_private.h"
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(new,DataDesc);
+GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_create,datadesc);
+
+/**
+ * gras_ddt_freev:
+ *
+ * gime that memory back, dude. I mean it.
+ */
+void gras_ddt_freev(void *ddt) {
+ gras_datadesc_type_t *type= (gras_datadesc_type_t *)ddt;
+
+ if (type) {
+ gras_datadesc_free(type);
+ }
+}
static gras_error_t
gras_ddt_new(const char *name,
gras_datadesc_type_t **dst) {
+ gras_error_t errcode;
+ gras_datadesc_type_t *res;
- gras_datadesc_type_t *res=malloc(sizeof(gras_datadesc_type_t));
+ GRAS_IN1("(%s)",name);
+ res=malloc(sizeof(gras_datadesc_type_t));
if (!res)
RAISE_MALLOC;
- memset(res, 0, sizeof(res));
+ memset(res, 0, sizeof(gras_datadesc_type_t));
res->name = strdup(name);
res->name_len = strlen(name);
- res->pre = NULL;
- res->post = NULL;
-
+
*dst=res;
+ TRY(gras_set_add(gras_datadesc_set_local,
+ (gras_set_elm_t*)res,&gras_ddt_freev));
+ GRAS_OUT;
return no_error;
}
/**
- * gras_ddt_new_scalar:
+ * gras_datadesc_by_name:
+ *
+ * Retrieve a type from its name
+ */
+gras_datadesc_type_t *gras_datadesc_by_name(const char *name) {
+
+ 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;
+ return type;
+ } else {
+ GRAS_OUT;
+ return NULL;
+ }
+}
+
+/**
+ * gras_datadesc_by_id:
+ *
+ * Retrieve a type from its code
+ */
+gras_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);
+}
+
+/**
+ * gras_datadesc_scalar:
*
* Create a new scalar and give a pointer to it
*/
gras_error_t
-gras_ddt_new_scalar(const char *name,
- gras_ddt_scalar_type_t type,
- enum e_gras_dd_scalar_encoding encoding,
- gras_datadesc_type_cb_void_t cb,
- gras_datadesc_type_t **dst) {
+gras_datadesc_scalar(const char *name,
+ gras_ddt_scalar_type_t type,
+ enum e_gras_dd_scalar_encoding encoding,
+ gras_datadesc_type_t **dst) {
gras_error_t errcode;
gras_datadesc_type_t *res;
long int arch;
+ GRAS_IN;
+ res = gras_datadesc_by_name(name);
+ if (res) {
+ gras_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,
+ "Redefinition of type %s does not match", name);
+ gras_assert1(res->category.scalar_data.type == type,
+ "Redefinition of type %s does not match", name);
+ VERB1("Discarding redefinition of %s",name);
+ *dst=res;
+ return no_error;
+ }
TRY(gras_ddt_new(name,dst));
res=*dst;
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 */
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");
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;
res->category.scalar_data.encoding = encoding;
-
- res->pre = cb;
+ res->category.scalar_data.type = type;
+ GRAS_OUT;
return no_error;
}
* 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;
+ GRAS_IN;
if (field) {
if (field->name)
free(field->name);
free(field);
}
+ GRAS_OUT;
}
/**
- * gras_ddt_new_struct:
+ * gras_datadesc_struct:
*
* Create a new struct and give a pointer to it
*/
gras_error_t
-gras_ddt_new_struct(const char *name,
- gras_datadesc_type_cb_void_t pre,
- gras_datadesc_type_cb_void_t post,
- gras_datadesc_type_t **dst) {
+gras_datadesc_struct(const char *name,
+ gras_datadesc_type_t **dst) {
gras_error_t errcode;
gras_datadesc_type_t *res;
long int arch;
-
+
+ GRAS_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,
+ "Redefinition of type %s does not match", name);
+ VERB1("Discarding redefinition of %s",name);
+ *dst=res;
+ return no_error;
+ }
TRY(gras_ddt_new(name,dst));
res=*dst;
for (arch=0; arch<gras_arch_count; arch ++) {
- res->size[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));
- res->pre = pre;
- res->post = post;
+ GRAS_OUT;
return no_error;
}
/**
- * gras_ddt_new_struct_append:
+ * gras_datadesc_struct_append:
*
* Append a field to the struct
*/
gras_error_t
-gras_ddt_new_struct_append(gras_datadesc_type_t *struct_type,
- const char *name,
- gras_datadesc_type_t *field_type,
- gras_datadesc_type_cb_void_t pre,
- gras_datadesc_type_cb_void_t post) {
+gras_datadesc_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_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 no_error;
+ }
+
+ 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)
field->name = strdup(name);
+ DEBUG0("----------------");
+ DEBUG4("PRE s={size=%ld,align=%ld,asize=%ld} 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; arch<gras_arch_count; arch ++) {
- field->offset[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 = pre;
- field->post = post;
+ field->type = field_type;
+ field->pre = NULL;
+ field->post = NULL;
TRY(gras_dynar_push(struct_type->category.struct_data.fields, &field));
- for (arch=0; arch<gras_arch_count; arch ++) {
- 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]);
- }
-
+ 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}",
+ field_type->size[GRAS_THISARCH],
+ field_type->alignment[GRAS_THISARCH],
+ field_type->aligned_size[GRAS_THISARCH]);
+ DEBUG3(" s={size=%ld,align=%ld,asize=%ld}",
+ struct_type->size[GRAS_THISARCH],
+ struct_type->alignment[GRAS_THISARCH],
+ struct_type->aligned_size[GRAS_THISARCH]);
+ GRAS_OUT;
return no_error;
}
+void
+gras_datadesc_struct_close(gras_datadesc_type_t *struct_type) {
+ GRAS_IN;
+ struct_type->category.struct_data.closed = 1;
+}
/**
- * gras_ddt_new_union:
+ * gras_datadesc_union:
*
* Create a new union and give a pointer to it
*/
gras_error_t
-gras_ddt_new_union(const char *name,
- gras_datadesc_type_cb_int_t selector,
- gras_datadesc_type_cb_void_t post,
- gras_datadesc_type_t **dst) {
+gras_datadesc_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;
int arch;
+ GRAS_IN1("(%s)",name);
gras_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,
+ "Redefinition of type %s does not match", name);
+ gras_assert1(res->category.union_data.selector == selector,
+ "Redefinition of type %s does not match", name);
+ VERB1("Discarding redefinition of %s",name);
+ *dst=res;
+ return no_error;
+ }
+
TRY(gras_ddt_new(name,dst));
res=*dst;
for (arch=0; arch<gras_arch_count; arch ++) {
- res->size[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*),
&gras_dd_cat_field_free));
res->category.union_data.selector = selector;
- res->pre = NULL;
- res->post = post;
return no_error;
}
/**
- * gras_ddt_new_union_append:
+ * gras_datadesc_union_append:
*
* Append a field to the union
*/
gras_error_t
-gras_ddt_new_union_append(gras_datadesc_type_t *union_type,
- const char *name,
- gras_datadesc_type_t *field_type,
- gras_datadesc_type_cb_void_t pre,
- gras_datadesc_type_cb_void_t post) {
+gras_datadesc_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_IN3("(%s %s.%s;)",field_type->name,union_type->name,name);
+ gras_assert1(field_type->size >= 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)",
+ union_type->name);
+ return no_error;
+ }
field=malloc(sizeof(gras_dd_cat_field_t));
if (!field)
for (arch=0; arch<gras_arch_count; arch ++) {
field->offset[arch] = 0; /* that's the purpose of union ;) */
}
- field->code = field_type->code;
- field->pre = pre;
- field->post = post;
+ field->type = field_type;
+ field->pre = NULL;
+ field->post = NULL;
TRY(gras_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], 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_union_close(gras_datadesc_type_t *union_type) {
+ union_type->category.union_data.closed = 1;
+}
/**
- * gras_ddt_new_ref:
+ * gras_datadesc_ref:
*
- * Create a new ref and give a pointer to it
+ * Create a new ref to a fixed type and give a pointer to it
*/
gras_error_t
-gras_ddt_new_ref(const char *name,
- gras_datadesc_type_t *referenced_type,
- gras_datadesc_type_cb_int_t selector,
- gras_datadesc_type_cb_void_t post,
- gras_datadesc_type_t **dst) {
+gras_datadesc_ref(const char *name,
+ gras_datadesc_type_t *referenced_type,
+ gras_datadesc_type_t **dst) {
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;
- gras_assert0(selector || referenced_type,
- "Attempt to create a generic reference without selector");
+ GRAS_IN1("(%s)",name);
+ res = gras_datadesc_by_name(name);
+ if (res) {
+ gras_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,
+ "Redefinition of %s does not match",name);
+ gras_assert1(res->category.ref_data.selector == NULL,
+ "Redefinition of %s does not match",name);
+ VERB1("Discarding redefinition of %s",name);
+ *dst=res;
+ return no_error;
+ }
+
+ TRY(gras_ddt_new(name,dst));
+ res=*dst;
+
+ gras_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];
+ 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;
+ res->category.ref_data.type = referenced_type;
+ res->category.ref_data.selector = NULL;
+
+ return no_error;
+}
+/**
+ * gras_datadesc_ref_generic:
+ *
+ * Create a new ref to a type given at use time, and give a pointer to it
+ */
+gras_error_t
+gras_datadesc_ref_generic(const char *name,
+ gras_datadesc_selector_t selector,
+ gras_datadesc_type_t **dst) {
+
+ 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);
+ res = gras_datadesc_by_name(name);
+ if (res) {
+ gras_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,
+ "Redefinition of type %s does not match", name);
+ gras_assert1(res->category.ref_data.selector == selector,
+ "Redefinition of type %s does not match", name);
+ VERB1("Discarding redefinition of %s",name);
+ *dst=res;
+ return no_error;
+ }
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; arch<gras_arch_count; 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->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;
- res->category.ref_data.code = referenced_type ? referenced_type->code : -1;
+ res->category.ref_data.type = NULL;
res->category.ref_data.selector = selector;
- res->pre = NULL;
- res->post = post;
return no_error;
}
/**
- * gras_ddt_new_array:
+ * gras_datadesc_array_fixed:
*
* Create a new array and give a pointer to it
*/
gras_error_t
-gras_ddt_new_array(const char *name,
- gras_datadesc_type_t *element_type,
- long int fixed_size,
- gras_datadesc_type_cb_int_t dynamic_size,
- gras_datadesc_type_cb_void_t post,
- gras_datadesc_type_t **dst) {
+gras_datadesc_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;
int arch;
- gras_assert0(dynamic_size || fixed_size>0,
- "Attempt to create a dynamic array without size discriminant");
-
+ GRAS_IN1("(%s)",name);
+ res = gras_datadesc_by_name(name);
+ if (res) {
+ gras_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,
+ "Redefinition of type %s does not match", name);
+ gras_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,
+ "Redefinition of type %s does not match", name);
+ VERB1("Discarding redefinition of %s",name);
+
+ *dst=res;
+ return no_error;
+ }
TRY(gras_ddt_new(name,dst));
res=*dst;
+ gras_assert1(fixed_size > 0, "'%s' is a array of negative fixed size",name);
for (arch=0; arch<gras_arch_count; arch ++) {
- if (fixed_size <= 0) {
- res->size[arch] = fixed_size; /* make sure it indicates "dynamic" */
- } else {
- res->size[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->size[arch] = fixed_size * element_type->aligned_size[arch];
+ 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;
+ res->category.array_data.type = element_type;
res->category.array_data.fixed_size = fixed_size;
- res->category.array_data.dynamic_size = dynamic_size;
-
- res->pre = NULL;
- res->post = post;
+ res->category.array_data.dynamic_size = NULL;
return no_error;
}
-
/**
- * gras_ddt_new_ignored:
+ * gras_datadesc_array_dyn:
*
- * Create a new ignored field and give a pointer to it.
- *
- * If you give a default value, it will be copied away so that you can free your copy.
+ * Create a new array and give a pointer to it
*/
gras_error_t
-gras_ddt_new_ignored(const char *name,
- void *default_value,
- void_f_pvoid_t *free_func,
- long int size,
- long int alignment,
- gras_datadesc_type_cb_void_t post,
- gras_datadesc_type_t **dst) {
- RAISE_UNIMPLEMENTED;
- /*
+gras_datadesc_array_dyn(const char *name,
+ gras_datadesc_type_t *element_type,
+ gras_datadesc_type_cb_int_t dynamic_size,
+ gras_datadesc_type_t **dst) {
+
gras_error_t errcode;
gras_datadesc_type_t *res;
+ int arch;
+
+ GRAS_IN1("(%s)",name);
+ gras_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,
+ "Redefinition of type %s does not match", name);
+ gras_assert1(res->category.array_data.type == element_type,
+ "Redefinition of type %s does not match", name);
+ gras_assert1(res->category.array_data.fixed_size == -1,
+ "Redefinition of type %s does not match", name);
+ gras_assert1(res->category.array_data.dynamic_size == dynamic_size,
+ "Redefinition of type %s does not match", name);
+ VERB1("Discarding redefinition of %s",name);
+
+ *dst=res;
+ return no_error;
+ }
TRY(gras_ddt_new(name,dst));
res=*dst;
- res->size = size > 0?size:0;
- res->alignment = alignment;
-
- if (size > 0) {
- res->aligned_size = aligned(size, alignment);
- } else {
- res->aligned_size = 0;
- }
-
- if (default_value && res->size) {
- res->category.ignored_data.default_value = malloc((size_t)size);
- if (! (res->category.ignored_data.default_value) )
- RAISE_MALLOC;
- memcpy(res->category.ignored_data.default_value,
- default_value, (size_t)size);
+ for (arch=0; arch<gras_arch_count; arch ++) {
+ res->size[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->category_code = e_gras_datadesc_type_cat_ignored;
- res->category.ignored_data.free_func = free_func;
-
- res->post = post;
-
+ res->category_code = e_gras_datadesc_type_cat_array;
- res->size = size;
+ res->category.array_data.type = element_type;
+ res->category.array_data.fixed_size = -1;
+ res->category.array_data.dynamic_size = dynamic_size;
return no_error;
- */
}
/**
- * gras_ddt_new_parse:
+ * gras_datadesc_ref_pop_arr:
+ *
+ * Most of the time, you want to include a reference in your structure which
+ * is a pointer to a dynamic array whose size is fixed by another field of
+ * your structure.
+ *
+ * This case pops up so often that this function was created to take care of
+ * this case. It creates a dynamic array type whose size is poped from the
+ * current cbps, and then create a reference to it.
+ *
+ * The name of the created datatype will be the name of the element type, with
+ * '[]*' appended to it.
+ *
+ * Then to use it, you just have to make sure that your structure pre-callback
+ * does push the size of the array in the cbps (using #gras_cbps_i_push), and
+ * you are set.
+ *
+ * But be remember that this is a stack. If you have two different pop_arr, you
+ * should push the second one first, so that the first one is on the top of the
+ * list when the first field gets transfered.
*
- * Create a datadescription from the result of parsing the C type description
*/
-gras_error_t
-gras_ddt_new_parse(const char *name,
- const char *C_statement,
- gras_datadesc_type_t **dst) {
- RAISE_UNIMPLEMENTED;
-}
+gras_error_t
+gras_datadesc_ref_pop_arr(gras_datadesc_type_t *element_type,
+ gras_datadesc_type_t **dst) {
+ gras_error_t errcode;
+ char *name=malloc(strlen(element_type->name) + 4);
+
+ sprintf(name,"%s[]",element_type->name);
+
+ TRY(gras_datadesc_array_dyn(name,element_type,
+ gras_datadesc_cb_pop, dst));
+
+ sprintf(name,"%s[]*",element_type->name);
+ TRY(gras_datadesc_ref(name,*dst,dst));
+ free(name);
+ return no_error;
+}
gras_error_t
-gras_ddt_new_from_nws(const char *name,
- const DataDescriptor *desc,
- size_t howmany,
- gras_datadesc_type_t **dst) {
+gras_datadesc_import_nws(const char *name,
+ const DataDescriptor *desc,
+ size_t howmany,
+ gras_datadesc_type_t **dst) {
RAISE_UNIMPLEMENTED;
}
/**
- * gras_ddt_free:
+ * gras_datadesc_cb_send:
*
- * Frees a datadescription.
+ * Add a pre-send callback to this datadexc.
+ * (useful to push the sizes of the upcoming arrays, for example)
*/
-void gras_ddt_free(gras_datadesc_type_t **type) {
- gras_datadesc_type_t *t;
-
- if (type && *type) {
- t=*type;
-
- free(t->name);
- switch (t->category_code) {
- case e_gras_datadesc_type_cat_scalar:
- case e_gras_datadesc_type_cat_ref:
- case e_gras_datadesc_type_cat_array:
- /* nothing to free in there */
- 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);
- }
- break;
-
- case e_gras_datadesc_type_cat_struct:
- gras_dynar_free(t->category.struct_data.fields);
- break;
-
- case e_gras_datadesc_type_cat_union:
- gras_dynar_free(t->category.union_data.fields);
- break;
-
- default:
- /* datadesc was invalid. Killing it is like euthanasy, I guess */
- break;
+void gras_datadesc_cb_send (gras_datadesc_type_t *type,
+ gras_datadesc_type_cb_void_t send) {
+ type->send = send;
+}
+/**
+ * gras_datadesc_cb_recv:
+ *
+ * Add a post-receive callback to this datadesc.
+ * (useful to put the function pointers to the rigth value, for example)
+ */
+void gras_datadesc_cb_recv(gras_datadesc_type_t *type,
+ gras_datadesc_type_cb_void_t recv) {
+ type->recv = recv;
+}
+
+/**
+ * gras_datadesc_unref:
+ *
+ * Removes a reference to the datastruct.
+ * ddt will be freed only when the refcount becomes 0.
+ */
+void gras_datadesc_free(gras_datadesc_type_t *type) {
+
+ DEBUG1("Let's free ddt %s",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:
+ /* nothing to free in there */
+ break;
+
+ case e_gras_datadesc_type_cat_ignored:
+ 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(type->category.struct_data.fields);
+ break;
+
+ case e_gras_datadesc_type_cat_union:
+ gras_dynar_free(type->category.union_data.fields);
+ break;
+
+ default:
+ /* datadesc was invalid. Killing it is like euthanasy, I guess */
+ break;
}
+ free(type->name);
+ free(type);
}
