- Found a strdup left over. Use xbt_strdup instead.

[simgrid.git] / src / gras / DataDesc / cbps.c

diff --git a/src/gras/DataDesc/cbps.c b/src/gras/DataDesc/cbps.c
index 9ce129b..8d840fd 100644 (file)
--- a/src/gras/DataDesc/cbps.c
+++ b/src/gras/DataDesc/cbps.c
@@ -9,6 +9,7 @@
 /* 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. */
 
+#include "xbt/ex.h"
 #include "gras/DataDesc/datadesc_private.h"
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_cbps,datadesc,"callback persistant state");
 
@@ -26,8 +27,6 @@ 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){
   free(*(void**)d);
 }
@@ -73,21 +72,24 @@ gras_cbps_v_push(gras_cbps_t          ps,
                 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);
@@ -117,14 +119,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(mismatch_error,1,"Asked to pop the non-existant %s", name);
   }
   xbt_dynar_pop(varstack, &var);
   
@@ -136,7 +141,7 @@ gras_cbps_v_pop (gras_cbps_t            ps,
   
   if (ddt)
     *ddt = var->type;  
-  data    = var->data;
+  data = var->data;
   
   free(var);
   
@@ -176,14 +181,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);
     
@@ -216,8 +220,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);
   
@@ -268,7 +271,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)) {
@@ -308,31 +311,31 @@ gras_cbps_i_pop(gras_cbps_t ps) {
  * 
  * 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);
 }
 
 /** \brief 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) {
+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);
 }
 
 /** \brief 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) {
+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);
 }
 
 /** \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);
 }
 /** \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);
 }