/* 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. */
+#include "xbt/ex.h"
#include "gras/DataDesc/datadesc_private.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_cbps,datadesc,"callback persistant state");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_ddt_cbps,gras_ddt,"callback persistant state");
typedef struct {
gras_datadesc_type_t type;
xbt_dynar_t globals;
} s_gras_cbps_t;
-static void free_string(void *d);
-
static void free_string(void *d){
- xbt_free(*(void**)d);
+ free(*(void**)d);
}
gras_cbps_t gras_cbps_new(void) {
xbt_dynar_free( &( (*state)->frames ) );
xbt_dynar_free( &( (*state)->globals ) );
- xbt_free(*state);
+ free(*state);
*state = NULL;
}
+void gras_cbps_reset(gras_cbps_t state) {
+
+ xbt_dynar_reset(state->lints);
+
+ xbt_dict_reset (state->space);
+
+ xbt_dynar_reset(state->frames);
+ xbt_dynar_reset(state->globals);
+}
+
/** \brief Declare a new element in the PS, and give it a value.
*
* If an element of that
* name already exists, it is masked by the one given here, and will be
* seeable again only after a pop to remove the value this push adds.
*/
-xbt_error_t
+void
gras_cbps_v_push(gras_cbps_t ps,
const char *name,
void *data,
gras_datadesc_type_t ddt) {
- xbt_dynar_t varstack,frame;
- gras_cbps_elm_t var;
- xbt_error_t errcode;
- char *varname = (char*)strdup(name);
+ xbt_dynar_t varstack=NULL,frame;
+ gras_cbps_elm_t var;
+ char *varname = (char*)xbt_strdup(name);
+ xbt_ex_t e;
DEBUG2("push(%s,%p)",name,(void*)data);
- errcode = xbt_dict_get(ps->space, name, (void **)&varstack);
-
- if (errcode == mismatch_error) {
+
+ TRY {
+ varstack = xbt_dict_get(ps->space, name);
+ } CATCH(e) {
+ if (e.category != mismatch_error)
+ RETHROW;
+
DEBUG1("Create a new variable stack for '%s' into the space",name);
varstack = xbt_dynar_new(sizeof (gras_cbps_elm_t *), NULL);
xbt_dict_set(ps->space, varname, (void **)varstack, NULL);
+ xbt_ex_free(e);
/* leaking, you think? only if you do not close all the openned blocks ;)*/
- } else if (errcode != no_error) {
- return errcode;
}
var = xbt_new0(s_gras_cbps_elm_t,1);
DEBUG4("Push %s (%p @%p) into frame %p",varname,(void*)varname,(void*)&varname,(void*)frame);
xbt_dynar_push(frame, &varname);
xbt_dynar_push(ps->frames, &frame);
- return no_error;
}
/** \brief Retrieve an element from the PS, and remove it from the PS.
*
- * If it's not
- * present in the current block, it will fail (with abort) and not search
- * in upper blocks since this denotes a programmation error.
+ * If it's not present in the current block, it will fail (throwing not_found)
+ * and not search in upper blocks since this denotes a programmation error.
*/
-xbt_error_t
+void
gras_cbps_v_pop (gras_cbps_t ps,
const char *name,
gras_datadesc_type_t *ddt,
xbt_dynar_t varstack,frame;
gras_cbps_elm_t var = NULL;
void *data = NULL;
- xbt_error_t errcode;
+ xbt_ex_t e;
DEBUG1("pop(%s)",name);
- /* FIXME: Error handling */
- errcode = xbt_dict_get(ps->space, name, (void **)&varstack);
- if (errcode == mismatch_error) {
- RAISE1(mismatch_error,"Asked to pop the non-existant %s",
- name);
+ TRY {
+ varstack = xbt_dict_get(ps->space, name);
+ } CATCH(e) {
+ if (e.category != mismatch_error)
+ RETHROW;
+
+ xbt_ex_free(e);
+ THROW1(not_found_error,1,"Asked to pop the non-existant %s", name);
}
xbt_dynar_pop(varstack, &var);
if (ddt)
*ddt = var->type;
- data = var->data;
+ data = var->data;
- xbt_free(var);
+ free(var);
xbt_dynar_pop(ps->frames, &frame);
{
_name = xbt_dynar_get_as(frame, l, char*);
if (!strcmp(name, _name)) {
xbt_dynar_remove_at(frame, l, &_name);
- xbt_free(_name);
+ free(_name);
break;
}
}
xbt_dynar_push(ps->frames, &frame);
*res = data;
- return no_error;
}
/** \brief Change the value of an element in the PS.
void *data,
gras_datadesc_type_t ddt) {
- xbt_dynar_t dynar = NULL;
- gras_cbps_elm_t elm = NULL;
- xbt_error_t errcode;
+ xbt_dynar_t dynar = NULL;
+ gras_cbps_elm_t elm = NULL;
DEBUG1("set(%s)",name);
- errcode = xbt_dict_get(ps->space, name, (void **)&dynar);
-
- if (errcode == mismatch_error) {
+ dynar = xbt_dict_get_or_null(ps->space, name);
+
+ if (dynar == NULL) {
dynar = xbt_dynar_new(sizeof (gras_cbps_elm_t), NULL);
xbt_dict_set(ps->space, name, (void **)dynar, NULL);
gras_cbps_elm_t elm = NULL;
DEBUG1("get(%s)",name);
- /* FIXME: Error handling */
- xbt_dict_get(ps->space, name, (void **)&dynar);
+ dynar = xbt_dict_get(ps->space, name);
xbt_dynar_pop(dynar, &elm);
xbt_dynar_push(dynar, &elm);
gras_cbps_elm_t var = NULL;
DEBUG2("Get ride of %s (%p)",name,(void*)name);
- xbt_dict_get(ps->space, name, (void **)&varstack);
+ varstack = xbt_dict_get(ps->space, name);
xbt_dynar_pop(varstack, &var);
if (!xbt_dynar_length(varstack)) {
xbt_dynar_free_container(&varstack); /*already empty, save a test ;) */
}
- if (var->data) xbt_free(var->data);
- xbt_free(var);
- xbt_free(name);
+ if (var->data) free(var->data);
+ free(var);
+ free(name);
}
xbt_dynar_free_container(&frame);/* we just emptied it */
DEBUG0("<<< Block end");
*
* Used by \ref gras_datadesc_ref_pop_arr
*/
-int gras_datadesc_cb_pop(gras_cbps_t vars, void *data) {
- return gras_cbps_i_pop(vars);
+int gras_datadesc_cb_pop(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) {
+ int res = gras_cbps_i_pop(vars);
+ DEBUG1("Pop %d as a size",res);
+ return res;
}
+/* ************************* */
+/* **** PUSHy callbacks **** */
+/* ************************* */
+
/** \brief Cb to push an integer. Must be attached to the field you want to push */
-void gras_datadesc_cb_push_int(gras_cbps_t vars, void *data) {
- int *i = (int*)data;
- gras_cbps_i_push(vars, (int) *i);
+void gras_datadesc_cb_push_int(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) {
+ int *i = (int*)data;
+ gras_cbps_i_push(vars, (int) *i);
}
/** \brief Cb to push an unsigned integer. Must be attached to the field you want to push */
-void gras_datadesc_cb_push_uint(gras_cbps_t vars, void *data) {
- unsigned int *i = (unsigned int*)data;
- gras_cbps_i_push(vars, (int) *i);
+void gras_datadesc_cb_push_uint(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) {
+ unsigned int *i = (unsigned int*)data;
+ gras_cbps_i_push(vars, (int) *i);
}
/** \brief Cb to push an long integer. Must be attached to the field you want to push
*/
-void gras_datadesc_cb_push_lint(gras_cbps_t vars, void *data) {
- long int *i = (long int*)data;
- gras_cbps_i_push(vars, (int) *i);
+void gras_datadesc_cb_push_lint(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) {
+ long int *i = (long int*)data;
+ gras_cbps_i_push(vars, (int) *i);
}
-/** \brief Cb to push an long integer. Must be attached to the field you want to push
+/** \brief Cb to push an unsigned long integer. Must be attached to the field you want to push
+ */
+void gras_datadesc_cb_push_ulint(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) {
+ unsigned long int *i = (unsigned long int*)data;
+ gras_cbps_i_push(vars, (int) *i);
+}
+
+/* ************************************ */
+/* **** PUSHy multiplier callbacks **** */
+/* ************************************ */
+/** \brief Cb to push an integer as multiplier. Must be attached to the field you want to push */
+void gras_datadesc_cb_push_int_mult(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) {
+ int old = *(int*)data;
+ int new = gras_cbps_i_pop(vars);
+ DEBUG2("push %d x %d as a size",old,new);
+ gras_cbps_i_push(vars, old*new);
+}
+
+/** \brief Cb to push an unsigned integer as multiplier. Must be attached to the field you want to push */
+void gras_datadesc_cb_push_uint_mult(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) {
+ unsigned int old = *(unsigned int*)data;
+ unsigned int new = gras_cbps_i_pop(vars);
+
+ DEBUG2("push %d x %d as a size",old,new);
+ gras_cbps_i_push(vars, (int) (old*new));
+}
+
+/** \brief Cb to push an long integer as multiplier. Must be attached to the field you want to push
*/
-void gras_datadesc_cb_push_ulint(gras_cbps_t vars, void *data) {
- unsigned long int *i = (unsigned long int*)data;
- gras_cbps_i_push(vars, (int) *i);
+void gras_datadesc_cb_push_lint_mult(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) {
+ long int i = *(long int*)data;
+ i *= gras_cbps_i_pop(vars);
+ gras_cbps_i_push(vars, (int) i);
+}
+/** \brief Cb to push an unsigned long integer as multiplier. Must be attached to the field you want to push
+ */
+void gras_datadesc_cb_push_ulint_mult(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) {
+ unsigned long int old = *(unsigned long int*)data;
+ unsigned long int new = gras_cbps_i_pop(vars);
+
+ DEBUG2("push %ld x %ld as a size",old,new);
+ gras_cbps_i_push(vars, (int) (old * new) );
}
