#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_reset(state->lints);
- xbt_dict_free ( &(state->space) );
- state->space = xbt_dict_new();
+ xbt_dict_reset (state->space);
xbt_dynar_reset(state->frames);
xbt_dynar_reset(state->globals);
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);
+ xbt_ex_free(e);
/* leaking, you think? only if you do not close all the openned blocks ;)*/
}
if (e.category != mismatch_error)
RETHROW;
- xbt_ex_free(&e);
+ xbt_ex_free(e);
THROW1(not_found_error,1,"Asked to pop the non-existant %s", name);
}
xbt_dynar_pop(varstack, &var);
/* ************************************ */
/** \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 i = *(int*)data;
- i *= gras_cbps_i_pop(vars);
- gras_cbps_i_push(vars, i);
+ 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 i = *(unsigned int*)data;
- i *= gras_cbps_i_pop(vars);
- gras_cbps_i_push(vars, (int) i);
+ 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
/** \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 i = *(unsigned long int*)data;
- i *= gras_cbps_i_pop(vars);
- gras_cbps_i_push(vars, (int) i);
+ 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) );
}