X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a30eb8d63c2291f6b50b935cecf16139b372f9f2..5f42b036f1f1c7b2a3c6f5276eb37d48dd080a45:/src/gras/DataDesc/cbps.c?ds=sidebyside

diff --git a/src/gras/DataDesc/cbps.c b/src/gras/DataDesc/cbps.c
index d4ac84b0b6..df1b055db7 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;
@@ -27,10 +27,6 @@ typedef struct s_gras_cbps {
   xbt_dynar_t globals;
 } s_gras_cbps_t;
 
-static void free_string(void *d){
-  free(*(void**)d);
-}
-
 gras_cbps_t gras_cbps_new(void) {
   gras_cbps_t  res;
 
@@ -64,8 +60,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);
@@ -99,7 +94,7 @@ gras_cbps_v_push(gras_cbps_t          ps,
     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 ;)*/
   }
  
@@ -137,7 +132,7 @@ gras_cbps_v_pop (gras_cbps_t            ps,
     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);
@@ -266,7 +261,7 @@ void
 gras_cbps_block_end(gras_cbps_t ps) {
 
   xbt_dynar_t  frame        = NULL;
-  int           cursor       =    0;
+  unsigned int cursor       =    0;
   char         *name         = NULL;
 
   xbt_assert0(xbt_dynar_length(ps->frames),
@@ -359,16 +354,19 @@ 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, 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
@@ -381,7 +379,9 @@ void gras_datadesc_cb_push_lint_mult(gras_datadesc_type_t ignored, gras_cbps_t v
 /** \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) );
 }