X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/340c9657933b7046dfd4c4ae347815a1c0155340..2da72a9e6d09f764ffaa7b3cbcd428150d9dc21f:/src/gras/DataDesc/cbps.c

diff --git a/src/gras/DataDesc/cbps.c b/src/gras/DataDesc/cbps.c
index 6f21158011..649bb1a4b7 100644
--- a/src/gras/DataDesc/cbps.c
+++ b/src/gras/DataDesc/cbps.c
@@ -11,7 +11,7 @@
 
 #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;
@@ -64,8 +64,7 @@ void gras_cbps_reset(gras_cbps_t state) {
 
   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);
@@ -320,7 +319,9 @@ gras_cbps_i_pop(gras_cbps_t ps) {
  * Used by \ref gras_datadesc_ref_pop_arr
  */
 int gras_datadesc_cb_pop(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) {
-  return gras_cbps_i_pop(vars);
+  int res =  gras_cbps_i_pop(vars);
+  DEBUG1("Pop %d as a size",res);
+  return res;
 }
 
 /* ************************* */
@@ -357,29 +358,34 @@ void gras_datadesc_cb_push_ulint(gras_datadesc_type_t ignored, gras_cbps_t vars,
 /* ************************************ */
 /** \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, (int) *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
  */
 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);
+  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 *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) );
 }