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

diff --git a/src/gras/DataDesc/cbps.c b/src/gras/DataDesc/cbps.c
index ad50759c61..e338b8e61d 100644
--- a/src/gras/DataDesc/cbps.c
+++ b/src/gras/DataDesc/cbps.c
@@ -2,12 +2,14 @@
 
 /* cbps - persistant states for callbacks                                   */
 
-/* Authors: Olivier Aumage, Martin Quinson                                  */
-/* Copyright (C) 2003, 2004 da GRAS posse.                                  */
+/* Copyright (c) 2003 Olivier Aumage.                                       */
+/* Copyright (c) 2003, 2004 Martin Quinson.                                 */
+/* All rights reserved.                                                     */
 
 /* 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. */
+ * 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");
 
@@ -25,10 +27,8 @@ typedef struct s_gras_cbps {
   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) {
@@ -56,38 +56,40 @@ void gras_cbps_free(gras_cbps_t *state) {
   xbt_dynar_free( &( (*state)->frames  ) );
   xbt_dynar_free( &( (*state)->globals ) );
 
-  xbt_free(*state);
+  free(*state);
   *state = NULL;
 }
 
-/**
- * gras_cbps_v_push:
+/** \brief Declare a new element in the PS, and give it a value.
  *
- * Declare a new element in the PS, and give it a value. If an element of that
+ * 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,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);
@@ -100,17 +102,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;
 }
 
-/**
- * gras_cbps_v_pop:
+/** \brief Retrieve an element from the PS, and remove it from the PS.
  *
- * 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,
@@ -118,14 +117,17 @@ gras_cbps_v_pop (gras_cbps_t            ps,
   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);
   
@@ -137,9 +139,9 @@ gras_cbps_v_pop (gras_cbps_t            ps,
   
   if (ddt)
     *ddt = var->type;  
-  data    = var->data;
+  data = var->data;
   
-  xbt_free(var);
+  free(var);
   
   xbt_dynar_pop(ps->frames, &frame);
   {
@@ -151,7 +153,7 @@ gras_cbps_v_pop (gras_cbps_t            ps,
       _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;
       }
     }
@@ -159,13 +161,10 @@ gras_cbps_v_pop (gras_cbps_t            ps,
   xbt_dynar_push(ps->frames, &frame);
   
   *res = data;
-  return no_error;
 }
 
-/**
- * gras_cbps_v_set:
- *
- * Change the value of an element in the PS.  
+/** \brief Change the value of an element in the PS.
+ * 
  * If it's not present in the current block, look in the upper ones.
  * If it's not present in any of them, modify in the globals
  * If not present there neither, the code may segfault (Oli?).
@@ -179,14 +178,13 @@ gras_cbps_v_set (gras_cbps_t          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);
     
@@ -203,10 +201,8 @@ gras_cbps_v_set (gras_cbps_t          ps,
 
 }
 
-/**
- * gras_cbps_v_get:
- *
- * Get the value of an element in the PS without modifying it. 
+/** \brief Get the value of an element in the PS without modifying it.
+ * 
  * (note that you get the content of the data struct and not a copy to it)
  * If it's not present in the current block, look in the upper ones.
  * If it's not present in any of them, look in the globals
@@ -221,8 +217,7 @@ gras_cbps_v_get (gras_cbps_t           ps,
   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);
   
@@ -234,10 +229,7 @@ gras_cbps_v_get (gras_cbps_t           ps,
 
 }
 
-/**
- * gras_cbps_block_begin:
- *
- * Begins a new block. 
+/** \brief Begins a new block. 
  *
  * Blocks are usefull to remove a whole set of declarations you don't even know
  *
@@ -258,11 +250,7 @@ gras_cbps_block_begin(gras_cbps_t ps) {
   xbt_dynar_push(ps->frames, &dynar);
 }
 
-/**
- * gras_cbps_block_end:
- *
- * End the current block, and go back to the upper one.
- */
+/** \brief End the current block, and go back to the upper one. */
 void
 gras_cbps_block_end(gras_cbps_t ps) {
 
@@ -280,7 +268,7 @@ gras_cbps_block_end(gras_cbps_t ps) {
     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)) {
@@ -288,31 +276,23 @@ gras_cbps_block_end(gras_cbps_t ps) {
       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");
 }
 
 
-/**
- * gras_cbps_i_push:
- *
- * Push a new long integer value into the cbps.
- */
+/** \brief Push a new integer value into the cbps. */
 void
 gras_cbps_i_push(gras_cbps_t ps,
 		 int val) {
   DEBUG1("push %d as a size",val);
   xbt_dynar_push_as(ps->lints,int,val);
 }
-/**
- * gras_cbps_i_pop:
- *
- * Pop the lastly pushed long integer value from the cbps.
- */
+/** \brief Pop the lastly pushed integer value from the cbps. */
 int
 gras_cbps_i_pop(gras_cbps_t ps) {
   int ret;
@@ -324,50 +304,35 @@ gras_cbps_i_pop(gras_cbps_t ps) {
   return ret;
 }
 
-/**
- * gras_datadesc_cb_pop:
- *
- * Generic cb returning the lastly pushed value
+/** \brief Generic cb returning the lastly pushed value
+ * 
+ * Used by \ref gras_datadesc_ref_pop_arr
  */
-int gras_datadesc_cb_pop(gras_cbps_t vars, void *data) {
+int gras_datadesc_cb_pop(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) {
   return gras_cbps_i_pop(vars);
 }
 
-/**
- * gras_datadesc_cb_push_int:
- * 
- * 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) {
+/** \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);
 }
 
-/**
- * gras_datadesc_cb_push_uint:
- * 
- * 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) {
+/** \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);
 }
 
-/**
- * gras_datadesc_cb_push_lint:
- * 
- * Cb to push an long integer. Must be attached to the field you want to push
+/** \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) {
+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);
 }
-/**
- * gras_datadesc_cb_push_ulint:
- * 
- * Cb to push an long integer. Must be attached to the field you want to push
+/** \brief Cb to push an long integer. Must be attached to the field you want to push
  */
-void gras_datadesc_cb_push_ulint(gras_cbps_t vars, void *data) {
+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);
 }