X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7cf6d75a72cb7aa2243030f752a3d249eea513d1..3913bb7b7d28a6c8f383b7973f72a4fc7a1f4f01:/src/gras/DataDesc/cbps.c

diff --git a/src/gras/DataDesc/cbps.c b/src/gras/DataDesc/cbps.c
index 8d840fd87e..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;
@@ -60,19 +60,29 @@ void gras_cbps_free(gras_cbps_t *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;
+  xbt_dynar_t     varstack=NULL,frame;
   gras_cbps_elm_t var;
   char           *varname = (char*)xbt_strdup(name);
   xbt_ex_t        e;
@@ -102,16 +112,14 @@ gras_cbps_v_push(gras_cbps_t          ps,
   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,
@@ -129,7 +137,7 @@ gras_cbps_v_pop (gras_cbps_t            ps,
       RETHROW;
 
     xbt_ex_free(e);
-    THROW1(mismatch_error,1,"Asked to pop the non-existant %s", name);
+    THROW1(not_found_error,1,"Asked to pop the non-existant %s", name);
   }
   xbt_dynar_pop(varstack, &var);
   
@@ -163,7 +171,6 @@ gras_cbps_v_pop (gras_cbps_t            ps,
   xbt_dynar_push(ps->frames, &frame);
   
   *res = data;
-  return no_error;
 }
 
 /** \brief Change the value of an element in the PS.
@@ -312,30 +319,73 @@ 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;
 }
 
+/* ************************* */
+/* **** 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_datadesc_type_t ignored, gras_cbps_t vars, void *data) {
-   int *i = (int*)data;
-   gras_cbps_i_push(vars, (int) *i);
+  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_datadesc_type_t ignored, gras_cbps_t vars, void *data) {
-   unsigned int *i = (unsigned int*)data;
-   gras_cbps_i_push(vars, (int) *i);
+  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_datadesc_type_t ignored, gras_cbps_t vars, void *data) {
-   long int *i = (long int*)data;
-   gras_cbps_i_push(vars, (int) *i);
+  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);
+  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_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) );
 }