X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/76bd2535194e7efa0ddfa271cf9fc3afdc344f59..5a56a7a2f426ab715677abb73698a586a5e6be4c:/src/xbt/config.c

diff --git a/src/xbt/config.c b/src/xbt/config.c
index a70796197e..6b791c080c 100644
--- a/src/xbt/config.c
+++ b/src/xbt/config.c
@@ -12,7 +12,7 @@
 #include "xbt/misc.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "xbt/error.h"
+#include "xbt/ex.h"
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
 
@@ -46,9 +46,8 @@ static const char *xbt_cfgelm_type_name[xbt_cfgelm_type_count]=
 static void xbt_cfgelm_free(void *data);
 
 /* Retrieve the variable we'll modify */
-static xbt_error_t xbt_cfgelm_get(xbt_cfg_t cfg, const char *name,
-				    e_xbt_cfgelm_type_t type,
-				    /* OUT */ xbt_cfgelm_t *whereto);
+static xbt_cfgelm_t xbt_cfgelm_get(xbt_cfg_t cfg, const char *name,
+				   e_xbt_cfgelm_type_t type);
 
 static void xbt_cfg_str_free(void *d){
   free(*(void**)d);
@@ -198,20 +197,34 @@ void xbt_cfgelm_free(void *data) {
 
 void
 xbt_cfg_register(xbt_cfg_t cfg,
-		  const char *name, e_xbt_cfgelm_type_t type,
-		  int min, int max,
-		  xbt_cfg_cb_t cb_set,  xbt_cfg_cb_t cb_rm){
+		 const char *name, e_xbt_cfgelm_type_t type,
+		 int min, int max,
+		 xbt_cfg_cb_t cb_set,  xbt_cfg_cb_t cb_rm){
   xbt_cfgelm_t res;
-  xbt_error_t errcode;
-
-  DEBUG4("Register cfg elm %s (%d to %d %s)",name,min,max,xbt_cfgelm_type_name[type]);
-  errcode = xbt_dict_get((xbt_dict_t)cfg,name,(void**)&res);
+  xbt_ex_t e;
+  int found=0;
+
+  xbt_assert(cfg);
+  xbt_assert4(type>=xbt_cfgelm_int && type<=xbt_cfgelm_host,
+              "type of %s not valid (%d should be between %d and %d)",
+              name,type,xbt_cfgelm_int, xbt_cfgelm_host);
+  DEBUG5("Register cfg elm %s (%d to %d %s (=%d))",
+	 name,min,max,xbt_cfgelm_type_name[type],type);
+  TRY {
+    res = xbt_dict_get((xbt_dict_t)cfg,name);
+  } CATCH(e) {
+    if (e.category == not_found_error) {
+      found = 1;
+      xbt_ex_free(e);
+    } else {
+      RETHROW;
+    }
+  }
 
-  if (errcode == no_error) {
+  if (!found) {
     WARN1("Config elem %s registered twice.",name);
     /* Will be removed by the insertion of the new one */
   } 
-  xbt_assert_error(mismatch_error);
 
   res=xbt_new(s_xbt_cfgelm_t,1);
 
@@ -251,11 +264,12 @@ xbt_cfg_register(xbt_cfg_t cfg,
  *  @arg name the name of the elem to be freed
  * 
  *  Note that it removes both the description and the actual content.
+ *  Throws not_found when no such element exists.
  */
 
-xbt_error_t
+void
 xbt_cfg_unregister(xbt_cfg_t cfg,const char *name) {
-  return xbt_dict_remove((xbt_dict_t)cfg,name);
+  xbt_dict_remove((xbt_dict_t)cfg,name);
 }
 
 /**
@@ -269,7 +283,7 @@ xbt_cfg_unregister(xbt_cfg_t cfg,const char *name) {
  * with type being one of  'string','int', 'host' or 'double'.
  */
 
-xbt_error_t
+void
 xbt_cfg_register_str(xbt_cfg_t cfg,const char *entry) {
   char *entrycpy=xbt_strdup(entry);
   char *tok;
@@ -278,66 +292,42 @@ xbt_cfg_register_str(xbt_cfg_t cfg,const char *entry) {
   e_xbt_cfgelm_type_t type;
 
   tok=strchr(entrycpy, ':');
-  if (!tok) {
-    ERROR3("%s%s%s",
-	  "Invalid config element descriptor: ",entry,
-	  "; Should be <name>:<min nb>_to_<max nb>_<type>");
-    free(entrycpy);
-    xbt_abort();
-  }
+  xbt_assert2(tok,"Invalid config element descriptor: %s%s",
+	      entry,
+	      "; Should be <name>:<min nb>_to_<max nb>_<type>");
   *(tok++)='\0';
 
   min=strtol(tok, &tok, 10);
-  if (!tok) {
-    ERROR1("Invalid minimum in config element descriptor %s",entry);
-    free(entrycpy);
-    xbt_abort();
-  }
+  xbt_assert1(tok,"Invalid minimum in config element descriptor %s",entry);
 
-  if (!strcmp(tok,"_to_")){
-    ERROR3("%s%s%s",
-	  "Invalid config element descriptor: ",entry,
-	  "; Should be <name>:<min nb>_to_<max nb>_<type>");
-    free(entrycpy);
-    xbt_abort();
-  }
+  xbt_assert2(strcmp(tok,"_to_"),
+	      "Invalid config element descriptor : %s%s",	    
+	      entry,
+	      "; Should be <name>:<min nb>_to_<max nb>_<type>");
   tok += strlen("_to_");
 
   max=strtol(tok, &tok, 10);
-  if (!tok) {
-    ERROR1("Invalid maximum in config element descriptor %s",entry);
-    free(entrycpy);
-    xbt_abort();
-  }
+  xbt_assert1(tok,"Invalid maximum in config element descriptor %s",entry);
 
-  if (*(tok++)!='_') {
-    ERROR3("%s%s%s",
-	  "Invalid config element descriptor: ",entry,
-	  "; Should be <name>:<min nb>_to_<max nb>_<type>");
-    free(entrycpy);
-    xbt_abort();
-  }
+  xbt_assert2( *(tok++) =='_',
+	       "Invalid config element descriptor: %s%s",entry,
+	       "; Should be <name>:<min nb>_to_<max nb>_<type>");
 
   for (type=0; 
        type<xbt_cfgelm_type_count && strcmp(tok,xbt_cfgelm_type_name[type]); 
        type++);
-  if (type == xbt_cfgelm_type_count) {
-    ERROR3("%s%s%s",
-	  "Invalid type in config element descriptor: ",entry,
+  xbt_assert2(type < xbt_cfgelm_type_count,
+	  "Invalid type in config element descriptor: %s%s",entry,
 	  "; Should be one of 'string', 'int', 'host' or 'double'.");
-    free(entrycpy);
-    xbt_abort();
-  }
 
   xbt_cfg_register(cfg,entrycpy,type,min,max,NULL,NULL);
 
   free(entrycpy); /* strdup'ed by dict mechanism, but cannot be const */
-  return no_error;
 }
 
 /** @brief Check that each variable have the right amount of values */
 
-xbt_error_t
+void
 xbt_cfg_check(xbt_cfg_t cfg) {
   xbt_dict_cursor_t cursor; 
   xbt_cfgelm_t variable;
@@ -349,54 +339,53 @@ xbt_cfg_check(xbt_cfg_t cfg) {
   xbt_dict_foreach((xbt_dict_t)cfg,cursor,name,variable) {
     size = xbt_dynar_length(variable->content);
     if (variable->min > size) { 
-      ERROR4("Config elem %s needs at least %d %s, but there is only %d values.",
+      xbt_dict_cursor_free(&cursor);
+      THROW4(mismatch_error,0,
+	     "Config elem %s needs at least %d %s, but there is only %d values.",
 	     name,
 	     variable->min,
 	     xbt_cfgelm_type_name[variable->type],
 	     size); 
-      xbt_dict_cursor_free(&cursor);
-      return mismatch_error;
     }
 
     if (variable->max > 0 && variable->max < size) {
-      ERROR4("Config elem %s accepts at most %d %s, but there is %d values.",
+      xbt_dict_cursor_free(&cursor);
+      THROW4(mismatch_error,0,
+	     "Config elem %s accepts at most %d %s, but there is %d values.",
 	     name,
 	     variable->max,
 	     xbt_cfgelm_type_name[variable->type],
 	     size);
-      xbt_dict_cursor_free(&cursor);
-      return mismatch_error;
     }
-
   }
 
   xbt_dict_cursor_free(&cursor);
-  return no_error;
 }
 
-static xbt_error_t xbt_cfgelm_get(xbt_cfg_t  cfg,
-				    const char *name,
-				    e_xbt_cfgelm_type_t type,
-				    /* OUT */ xbt_cfgelm_t *whereto){
-   
-  xbt_error_t errcode = xbt_dict_get((xbt_dict_t)cfg,name,
-				       (void**)whereto);
-
-  if (errcode == mismatch_error) {
-    RAISE1(mismatch_error,
-           "No registered variable '%s' in this config set",
-	   name);
+static xbt_cfgelm_t xbt_cfgelm_get(xbt_cfg_t  cfg,
+				   const char *name,
+				   e_xbt_cfgelm_type_t type){
+  xbt_cfgelm_t res=NULL;
+  xbt_ex_t e;
+
+  TRY {
+    res = xbt_dict_get((xbt_dict_t)cfg,name);
+  } CATCH(e) {
+    if (e.category == not_found_error) {
+      xbt_ex_free(e);
+      THROW1(not_found_error,0,
+	     "No registered variable '%s' in this config set",name);
+    }
+    RETHROW;
   }
-  if (errcode != no_error)
-     return errcode;
 
-  xbt_assert3(type == xbt_cfgelm_any || (*whereto)->type == type,
+  xbt_assert3(type == xbt_cfgelm_any || res->type == type,
 	       "You tried to access to the config element %s as an %s, but its type is %s.",
 	       name,
 	       xbt_cfgelm_type_name[type],
-	       xbt_cfgelm_type_name[(*whereto)->type]);
+	       xbt_cfgelm_type_name[res->type]);
 
-  return no_error;
+  return res;
 }
 
 /** @brief Get the type of this variable in that configuration set
@@ -407,93 +396,96 @@ static xbt_error_t xbt_cfgelm_get(xbt_cfg_t  cfg,
  *
  */
 
-xbt_error_t
-xbt_cfg_get_type(xbt_cfg_t cfg, const char *name, 
-		      /* OUT */e_xbt_cfgelm_type_t *type) {
-
-  xbt_cfgelm_t variable;
-  xbt_error_t errcode;
+e_xbt_cfgelm_type_t 
+xbt_cfg_get_type(xbt_cfg_t cfg, const char *name) {
 
-  TRYCATCH(mismatch_error,xbt_dict_get((xbt_dict_t)cfg,name,(void**)&variable));
+  xbt_cfgelm_t variable = NULL;
+  xbt_ex_t e;
 
-  if (errcode == mismatch_error)
-    RAISE1(mismatch_error,"Can't get the type of '%s' since this variable does not exist",
-	   name);
+  TRY {
+    variable = xbt_dict_get((xbt_dict_t)cfg,name);
+  } CATCH(e) {
+    if (e.category == not_found_error) { 
+      xbt_ex_free(e);
+      THROW1(not_found_error,0,
+	     "Can't get the type of '%s' since this variable does not exist",name);
+    }
+    RETHROW;
+  }
 
-  *type=variable->type;
+  INFO1("type in variable = %d",variable->type);
 
-  return no_error;
+  return variable->type;
 }
 
 /*----[ Setting ]---------------------------------------------------------*/
 /**  @brief va_args version of xbt_cfg_set
  *
  * \arg cfg config set to fill
- * \arg varargs NULL-terminated list of pairs {(const char*)key, value}
+ * \arg n   variable name
+ * \arg pa  variable value
  *
  * Add some values to the config set.
- * \warning if the list isn't NULL terminated, it will segfault. 
  */
-xbt_error_t
-xbt_cfg_set_vargs(xbt_cfg_t cfg, va_list pa) {
-  char *str,*name;
+void
+xbt_cfg_set_vargs(xbt_cfg_t cfg, const char *name, va_list pa) {
+  char *str;
   int i;
   double d;
-  e_xbt_cfgelm_type_t type;
+  e_xbt_cfgelm_type_t type=0; /* Set a dummy value to make gcc happy. It cannot get uninitialized */
 
-  xbt_error_t errcode;
+  xbt_ex_t e;
   
-  while ((name=va_arg(pa,char *))) {
-
-    if (!xbt_cfg_get_type(cfg,name,&type)) {
-      ERROR1("Can't set the property '%s' since it's not registered",name);
-      return mismatch_error;
+  TRY {
+    type = xbt_cfg_get_type(cfg,name);
+  } CATCH(e) {
+    if (e.category == not_found_error) {
+      xbt_ex_free(e);
+      THROW1(not_found_error,0,"Can't set the property '%s' since it's not registered",name);
     }
+    RETHROW;
+  }
 
-    switch (type) {
-    case xbt_cfgelm_host:
-      str = va_arg(pa, char *);
-      i=va_arg(pa,int);
-      TRY(xbt_cfg_set_host(cfg,name,str,i));
-      break;
+  switch (type) {
+  case xbt_cfgelm_host:
+    str = va_arg(pa, char *);
+    i=va_arg(pa,int);
+    xbt_cfg_set_host(cfg,name,str,i);
+    break;
       
-    case xbt_cfgelm_string:
-      str=va_arg(pa, char *);
-      TRY(xbt_cfg_set_string(cfg, name, str));
-      break;
+  case xbt_cfgelm_string:
+    str=va_arg(pa, char *);
+    xbt_cfg_set_string(cfg, name, str);
+    break;
 
-    case xbt_cfgelm_int:
-      i=va_arg(pa,int);
-      TRY(xbt_cfg_set_int(cfg,name,i));
-      break;
+  case xbt_cfgelm_int:
+    i=va_arg(pa,int);
+    xbt_cfg_set_int(cfg,name,i);
+    break;
 
-    case xbt_cfgelm_double:
-      d=va_arg(pa,double);
-      TRY(xbt_cfg_set_double(cfg,name,d));
-      break;
+  case xbt_cfgelm_double:
+    d=va_arg(pa,double);
+    xbt_cfg_set_double(cfg,name,d);
+    break;
 
-    default: 
-      RAISE1(unknown_error,"Config element variable %s not valid.",name);
-    }
+  default:
+    xbt_assert2(0,"Config element variable %s not valid (type=%d)",name,type);
   }
-  return no_error;
 }
 
 /** @brief Add a NULL-terminated list of pairs {(char*)key, value} to the set
  *
  * \arg cfg config set to fill
- * \arg varargs NULL-terminated list of pairs {(const char*)key, value}
+ * \arg name variable name
+ * \arg varargs variable value
  *
- * \warning if the list isn't NULL terminated, it will segfault. 
  */
-xbt_error_t xbt_cfg_set(xbt_cfg_t cfg, ...) {
+void xbt_cfg_set(xbt_cfg_t cfg, const char *name, ...) {
   va_list pa;
-  xbt_error_t errcode;
 
-  va_start(pa,cfg);
-  errcode=xbt_cfg_set_vargs(cfg,pa);
+  va_start(pa,name);
+  xbt_cfg_set_vargs(cfg,name,pa);
   va_end(pa);
-  return errcode;
 }
 
 /** @brief Add values parsed from a string into a config set
@@ -508,22 +500,23 @@ xbt_error_t xbt_cfg_set(xbt_cfg_t cfg, ...) {
  * @todo This is a crude manual parser, it should be a proper lexer.
  */
 
-xbt_error_t
+void
 xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
+  xbt_ex_t e;
+
   int i;
   double d;
   char *str;
 
-  xbt_cfgelm_t variable;
+  xbt_cfgelm_t variable=NULL;
   char *optionlist_cpy;
   char *option,  *name,*val;
 
   int len;
-  xbt_error_t errcode;
 
   XBT_IN;
   if (!options || !strlen(options)) { /* nothing to do */
-    return no_error;
+    return;
   }
   optionlist_cpy=xbt_strdup(options);
 
@@ -548,8 +541,8 @@ xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
       option=NULL; /* don't do next iteration */
 
     } else {
-      DEBUG3("Boundary on '%c'. len=%d;option-name=%d",
-	     *option,len,option-name);
+      DEBUG3("Boundary on '%c'. len=%d;option-name=%ld",
+	     *option,len,(long)(option-name));
 
       /* Pass the following blank chars */
       *(option++)='\0';
@@ -572,102 +565,88 @@ xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
     if (!val) {
       free(optionlist_cpy);
       xbt_assert1(FALSE,
-	     "Malformated option: '%s'; Should be of the form 'name:value'",
+	     "Option '%s' badly formated. Should be of the form 'name:value'",
 		  name);
     }
     *(val++)='\0';
 
     DEBUG2("name='%s';val='%s'",name,val);
 
-    errcode=xbt_dict_get((xbt_dict_t)cfg,name,(void**)&variable);
-    switch (errcode) {
-    case no_error:
-      break;
-    case mismatch_error:
-      ERROR1("No registrated variable corresponding to '%s'.",name);
+    TRY {
+      variable = xbt_dict_get((xbt_dict_t)cfg,name);
+    } CATCH(e) {
+      /* put it back on what won't get freed, ie within "options" and out of "optionlist_cpy" */
+      name = (char*) (optionlist_cpy-name + options); 
       free(optionlist_cpy);
-      return mismatch_error;
-      break;
-    default:
-      free(optionlist_cpy);
-      return errcode;
-    }
-
-    switch (variable->type) {
-    case xbt_cfgelm_string:
-      errcode = xbt_cfg_set_string(cfg, name, val);
-      if (errcode != no_error) {
-	 free(optionlist_cpy);
-         return errcode;
-      }
-      break;
-
-    case xbt_cfgelm_int:
-      i=strtol(val, &val, 0);
-      if (val==NULL) {
-	free(optionlist_cpy);	
-	xbt_assert1(FALSE,
-		     "Value of option %s not valid. Should be an integer",
-		     name);
-      }
-
-      errcode = xbt_cfg_set_int(cfg,name,i);
-      if (errcode != no_error) {
-	 free(optionlist_cpy);
-	 return errcode;
-      }
-      break;
-
-    case xbt_cfgelm_double:
-      d=strtod(val, &val);
-      if (val==NULL) {
-	free(optionlist_cpy);	
-	xbt_assert1(FALSE,
-	       "Value of option %s not valid. Should be a double",
-	       name);
-      }
-
-      errcode = xbt_cfg_set_double(cfg,name,d);
-      if (errcode != no_error) {
-	 free(optionlist_cpy);
-	 return errcode;
-      }
-      break;
-
-    case xbt_cfgelm_host:
-      str=val;
-      val=strchr(val,':');
-      if (!val) {
-	free(optionlist_cpy);	
-	xbt_assert1(FALSE,
-	    "Value of option %s not valid. Should be an host (machine:port)",
-	       name);
-      }
-
-      *(val++)='\0';
-      i=strtol(val, &val, 0);
-      if (val==NULL) {
-	free(optionlist_cpy);	
-	xbt_assert1(FALSE,
-	    "Value of option %s not valid. Should be an host (machine:port)",
-	       name);
+      if (e.category == not_found_error) {
+	xbt_ex_free(e);
+	THROW1(not_found_error,0,"No registrated variable corresponding to '%s'.",name);
       }
+      RETHROW;
+    }
 
-      errcode = xbt_cfg_set_host(cfg,name,str,i);
-      if (errcode != no_error) {
-	 free(optionlist_cpy);
-	 return errcode;
+    TRY {
+      switch (variable->type) {
+      case xbt_cfgelm_string:
+	xbt_cfg_set_string(cfg, name, val); /* throws */
+	break;
+
+      case xbt_cfgelm_int:
+	i=strtol(val, &val, 0);
+	if (val==NULL) {
+	  free(optionlist_cpy);	
+	  xbt_assert1(FALSE,
+		      "Value of option %s not valid. Should be an integer",
+		      name);
+	}
+
+	xbt_cfg_set_int(cfg,name,i); /* throws */
+	break;
+
+      case xbt_cfgelm_double:
+	d=strtod(val, &val);
+	if (val==NULL) {
+	  free(optionlist_cpy);	
+	  xbt_assert1(FALSE,
+		      "Value of option %s not valid. Should be a double",
+		      name);
+	}
+
+	xbt_cfg_set_double(cfg,name,d); /* throws */
+	break;
+
+      case xbt_cfgelm_host:
+	str=val;
+	val=strchr(val,':');
+	if (!val) {
+	  free(optionlist_cpy);	
+	  xbt_assert1(FALSE,
+		      "Value of option %s not valid. Should be an host (machine:port)",
+		      name);
+	}
+	
+	*(val++)='\0';
+	i=strtol(val, &val, 0);
+	if (val==NULL) {
+	  free(optionlist_cpy);	
+	  xbt_assert1(FALSE,
+		      "Value of option %s not valid. Should be an host (machine:port)",
+		      name);
+	}
+
+	xbt_cfg_set_host(cfg,name,str,i); /* throws */ 
+	break;      
+
+      default: 
+	THROW1(unknown_error,0,"Type of config element %s is not valid.",name);
       }
-      break;      
-
-    default: 
+    } CATCH(e) {
       free(optionlist_cpy);
-      RAISE1(unknown_error,"Type of config element %s is not valid.",name);
+      RETHROW;
     }
-    
   }
   free(optionlist_cpy);
-  return no_error;
+
 }
 
 /** @brief Set or add an integer value to \a name within \a cfg
@@ -676,13 +655,12 @@ xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
  * \arg name the name of the variable
  * \arg val the value of the variable
  */ 
-xbt_error_t
+void
 xbt_cfg_set_int(xbt_cfg_t cfg,const char*name, int val) {
   xbt_cfgelm_t variable;
-  xbt_error_t errcode;
 
   VERB2("Configuration setting: %s=%d",name,val);
-  TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_int,&variable));
+  variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_int);
 
   if (variable->max == 1) {
     if (variable->cb_rm && xbt_dynar_length(variable->content))
@@ -691,7 +669,7 @@ xbt_cfg_set_int(xbt_cfg_t cfg,const char*name, int val) {
     xbt_dynar_set(variable->content,0,&val);
   } else {
     if (variable->max && xbt_dynar_length(variable->content) == variable->max)
-      RAISE3(mismatch_error,
+      THROW3(mismatch_error,0,
              "Cannot add value %d to the config element %s since it's already full (size=%d)",
              val,name,variable->max); 
              
@@ -700,7 +678,6 @@ xbt_cfg_set_int(xbt_cfg_t cfg,const char*name, int val) {
 
   if (variable->cb_set)
     (*variable->cb_set)(name, xbt_dynar_length(variable->content) -1);
-  return no_error;
 }
 
 /** @brief Set or add a double value to \a name within \a cfg
@@ -710,13 +687,12 @@ xbt_cfg_set_int(xbt_cfg_t cfg,const char*name, int val) {
  * \arg val the doule to set
  */ 
 
-xbt_error_t
+void
 xbt_cfg_set_double(xbt_cfg_t cfg,const char*name, double val) {
   xbt_cfgelm_t variable;
-  xbt_error_t errcode;
 
   VERB2("Configuration setting: %s=%f",name,val);
-  TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_double,&variable));
+  variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_double);
 
   if (variable->max == 1) {
     if (variable->cb_rm && xbt_dynar_length(variable->content))
@@ -725,7 +701,7 @@ xbt_cfg_set_double(xbt_cfg_t cfg,const char*name, double val) {
     xbt_dynar_set(variable->content,0,&val);
   } else {
     if (variable->max && xbt_dynar_length(variable->content) == variable->max)
-      RAISE3(mismatch_error,
+      THROW3(mismatch_error,0,
              "Cannot add value %f to the config element %s since it's already full (size=%d)",
              val,name,variable->max); 
              
@@ -734,7 +710,6 @@ xbt_cfg_set_double(xbt_cfg_t cfg,const char*name, double val) {
 
   if (variable->cb_set)
     (*variable->cb_set)(name, xbt_dynar_length(variable->content) -1);
-  return no_error;
 }
 
 /** @brief Set or add a string value to \a name within \a cfg
@@ -745,14 +720,13 @@ xbt_cfg_set_double(xbt_cfg_t cfg,const char*name, double val) {
  *
  */ 
 
-xbt_error_t
+void
 xbt_cfg_set_string(xbt_cfg_t cfg,const char*name, const char*val) { 
   xbt_cfgelm_t variable;
-  xbt_error_t errcode;
   char *newval = xbt_strdup(val);
 
   VERB2("Configuration setting: %s=%s",name,val);
-  TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_string,&variable));
+  variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_string);
 
   if (variable->max == 1) {
     if (variable->cb_rm && xbt_dynar_length(variable->content))
@@ -761,7 +735,7 @@ xbt_cfg_set_string(xbt_cfg_t cfg,const char*name, const char*val) {
     xbt_dynar_set(variable->content,0,&newval);
   } else {
     if (variable->max && xbt_dynar_length(variable->content) == variable->max)
-      RAISE3(mismatch_error,
+      THROW3(mismatch_error,0,
              "Cannot add value %s to the config element %s since it's already full (size=%d)",
              name,val,variable->max); 
              
@@ -770,7 +744,6 @@ xbt_cfg_set_string(xbt_cfg_t cfg,const char*name, const char*val) {
 
   if (variable->cb_set)
     (*variable->cb_set)(name, xbt_dynar_length(variable->content) -1);
-  return no_error;
 }
 
 /** @brief Set or add an host value to \a name within \a cfg
@@ -783,11 +756,10 @@ xbt_cfg_set_string(xbt_cfg_t cfg,const char*name, const char*val) {
  * \e host values are composed of a string (hostname) and an integer (port)
  */ 
 
-xbt_error_t 
+void
 xbt_cfg_set_host(xbt_cfg_t cfg,const char*name, 
 		  const char *host,int port) {
   xbt_cfgelm_t variable;
-  xbt_error_t errcode;
   xbt_host_t *val=xbt_new(xbt_host_t,1);
 
   VERB3("Configuration setting: %s=%s:%d",name,host,port);
@@ -795,7 +767,7 @@ xbt_cfg_set_host(xbt_cfg_t cfg,const char*name,
   val->name = xbt_strdup(name);
   val->port = port;
 
-  TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_host,&variable));
+  variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_host);
 
   if (variable->max == 1) {
     if (variable->cb_rm && xbt_dynar_length(variable->content))
@@ -804,7 +776,7 @@ xbt_cfg_set_host(xbt_cfg_t cfg,const char*name,
     xbt_dynar_set(variable->content,0,&val);
   } else {
     if (variable->max && xbt_dynar_length(variable->content) == variable->max)
-      RAISE4(mismatch_error,
+      THROW4(mismatch_error,0,
              "Cannot add value %s:%d to the config element %s since it's already full (size=%d)",
              host,port,name,variable->max); 
              
@@ -813,7 +785,6 @@ xbt_cfg_set_host(xbt_cfg_t cfg,const char*name,
 
   if (variable->cb_set)
     (*variable->cb_set)(name, xbt_dynar_length(variable->content) -1);
-  return no_error;
 }
 
 /* ---- [ Removing ] ---- */
@@ -824,30 +795,28 @@ xbt_cfg_set_host(xbt_cfg_t cfg,const char*name,
  * \arg name the name of the variable
  * \arg val the value to be removed
  */
-xbt_error_t xbt_cfg_rm_int(xbt_cfg_t cfg,const char*name, int val) {
+void xbt_cfg_rm_int(xbt_cfg_t cfg,const char*name, int val) {
 
   xbt_cfgelm_t variable;
   int cpt,seen;
-  xbt_error_t errcode;
 
+  variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_int);
+  
   if (xbt_dynar_length(variable->content) == variable->min)
-    RAISE3(mismatch_error,
+    THROW3(mismatch_error,0,
            "Cannot remove value %d from the config element %s since it's already at its minimal size (=%d)",
            val,name,variable->min); 
 
-  TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_int,&variable));
-  
   xbt_dynar_foreach(variable->content,cpt,seen) {
     if (seen == val) {
       if (variable->cb_rm) (*variable->cb_rm)(name, cpt);
       xbt_dynar_cursor_rm(variable->content,&cpt);
-      return no_error;
+      return;
     }
   }
 
-  ERROR2("Can't remove the value %d of config element %s: value not found.",
-	 val,name);
-  return mismatch_error;
+  THROW2(not_found_error,0,
+	 "Can't remove the value %d of config element %s: value not found.",val,name);
 }
 
 /** @brief Remove the provided \e val double value from a variable
@@ -857,30 +826,29 @@ xbt_error_t xbt_cfg_rm_int(xbt_cfg_t cfg,const char*name, int val) {
  * \arg val the value to be removed
  */
 
-xbt_error_t xbt_cfg_rm_double(xbt_cfg_t cfg,const char*name, double val) {
+void xbt_cfg_rm_double(xbt_cfg_t cfg,const char*name, double val) {
   xbt_cfgelm_t variable;
   int cpt;
   double seen;
-  xbt_error_t errcode;
 
+  variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_double);
+  
   if (xbt_dynar_length(variable->content) == variable->min)
-    RAISE3(mismatch_error,
+    THROW3(mismatch_error,0,
            "Cannot remove value %f from the config element %s since it's already at its minimal size (=%d)",
            val,name,variable->min); 
 
-  TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_double,&variable));
-  
   xbt_dynar_foreach(variable->content,cpt,seen) {
     if (seen == val) {
       xbt_dynar_cursor_rm(variable->content,&cpt);
-      if (variable->cb_rm) (*variable->cb_rm)(name, cpt);
-      return no_error;
+      if (variable->cb_rm)
+	(*variable->cb_rm)(name, cpt);
+      return;
     }
   }
 
-  ERROR2("Can't remove the value %f of config element %s: value not found.",
-	 val,name);
-  return mismatch_error;
+  THROW2(not_found_error,0,
+	 "Can't remove the value %f of config element %s: value not found.",val,name);
 }
 
 /** @brief Remove the provided \e val string value from a variable
@@ -889,31 +857,30 @@ xbt_error_t xbt_cfg_rm_double(xbt_cfg_t cfg,const char*name, double val) {
  * \arg name the name of the variable
  * \arg val the value of the string which will be removed
  */
-xbt_error_t
+void
 xbt_cfg_rm_string(xbt_cfg_t cfg,const char*name, const char *val) {
   xbt_cfgelm_t variable;
   int cpt;
   char *seen;
-  xbt_error_t errcode;
 
+  variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_string);
+  
   if (xbt_dynar_length(variable->content) == variable->min)
-    RAISE3(mismatch_error,
+    THROW3(mismatch_error,0,
            "Cannot remove value %s from the config element %s since it's already at its minimal size (=%d)",
            name,val,variable->min); 
            
-  TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_string,&variable));
-  
   xbt_dynar_foreach(variable->content,cpt,seen) {
     if (!strcpy(seen,val)) {
-      if (variable->cb_rm) (*variable->cb_rm)(name, cpt);
+      if (variable->cb_rm)
+	(*variable->cb_rm)(name, cpt);
       xbt_dynar_cursor_rm(variable->content,&cpt);
-      return no_error;
+      return;
     }
   }
 
-  ERROR2("Can't remove the value %s of config element %s: value not found.",
-	 val,name);
-  return mismatch_error;
+  THROW2(not_found_error,0,
+	 "Can't remove the value %s of config element %s: value not found.",val,name);
 }
 
 /** @brief Remove the provided \e val host value from a variable
@@ -924,53 +891,47 @@ xbt_cfg_rm_string(xbt_cfg_t cfg,const char*name, const char *val) {
  * \arg port the port number
  */
 
-xbt_error_t
+void
 xbt_cfg_rm_host(xbt_cfg_t cfg,const char*name, const char *host,int port) {
   xbt_cfgelm_t variable;
   int cpt;
   xbt_host_t *seen;
-  xbt_error_t errcode;
 
+  variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_host);
+  
   if (xbt_dynar_length(variable->content) == variable->min)
-    RAISE4(mismatch_error,
+    THROW4(mismatch_error,0,
            "Cannot remove value %s:%d from the config element %s since it's already at its minimal size (=%d)",
            host,port,name,variable->min); 
            
-  TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_host,&variable));
-  
   xbt_dynar_foreach(variable->content,cpt,seen) {
     if (!strcpy(seen->name,host) && seen->port == port) {
       if (variable->cb_rm) (*variable->cb_rm)(name, cpt);
       xbt_dynar_cursor_rm(variable->content,&cpt);
-      return no_error;
+      return;
     }
   }
 
-  ERROR3("Can't remove the value %s:%d of config element %s: value not found.",
+  THROW3(not_found_error,0,
+	 "Can't remove the value %s:%d of config element %s: value not found.",
 	 host,port,name);
-  return mismatch_error;
 }
 
 /** @brief Remove the \e pos th value from the provided variable */
 
-xbt_error_t xbt_cfg_rm_at   (xbt_cfg_t cfg, const char *name, int pos) {
+void xbt_cfg_rm_at   (xbt_cfg_t cfg, const char *name, int pos) {
 
   xbt_cfgelm_t variable;
-  int cpt;
-  xbt_host_t *seen;
-  xbt_error_t errcode;
 
+  variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_any);
+  
   if (xbt_dynar_length(variable->content) == variable->min)
-    RAISE3(mismatch_error,
+    THROW3(mismatch_error,0,
            "Cannot remove %dth value from the config element %s since it's already at its minimal size (=%d)",
            pos,name,variable->min); 
-           
-  TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_any,&variable));
   
   if (variable->cb_rm) (*variable->cb_rm)(name, pos);	  
   xbt_dynar_remove_at(variable->content, pos, NULL);
-
-  return mismatch_error;
 }
 
 /** @brief Remove all the values from a variable
@@ -979,18 +940,20 @@ xbt_error_t xbt_cfg_rm_at   (xbt_cfg_t cfg, const char *name, int pos) {
  * \arg name the name of the variable
  */
 
-xbt_error_t 
+void
 xbt_cfg_empty(xbt_cfg_t cfg,const char*name) {
-  xbt_cfgelm_t variable;
+  xbt_cfgelm_t variable=NULL;
+  xbt_ex_t e;
 
-  xbt_error_t errcode;
+  TRY {
+    variable = xbt_dict_get((xbt_dict_t)cfg,name);
+  } CATCH(e) {
+    if (e.category != not_found_error)
+      RETHROW;
 
-  TRYCATCH(mismatch_error,
-	   xbt_dict_get((xbt_dict_t)cfg,name,(void**)&variable));
-  if (errcode == mismatch_error) {
-    ERROR1("Can't empty  '%s' since this config element does not exist",
-	   name);
-    return mismatch_error;
+    xbt_ex_free(e);
+    THROW1(not_found_error,0,
+	   "Can't empty  '%s' since this config element does not exist", name);
   }
 
   if (variable) {
@@ -1003,7 +966,6 @@ xbt_cfg_empty(xbt_cfg_t cfg,const char*name) {
     }
     xbt_dynar_reset(variable->content);
   }
-  return no_error;
 }
 
 /*----[ Getting ]---------------------------------------------------------*/
@@ -1020,22 +982,16 @@ xbt_cfg_empty(xbt_cfg_t cfg,const char*name) {
  *
  * \warning the returned value is the actual content of the config set
  */
-xbt_error_t
-xbt_cfg_get_int   (xbt_cfg_t  cfg,
-		    const char *name,
-		    int        *val) {
-  xbt_cfgelm_t variable;
-  xbt_error_t errcode;
-
-  TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_int,&variable));
+int 
+xbt_cfg_get_int (xbt_cfg_t  cfg, const char *name) {
+  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_int);
 
   if (xbt_dynar_length(variable->content) > 1) {
     WARN2("You asked for the first value of the config element '%s', but there is %lu values",
-	     name, xbt_dynar_length(variable->content));
+	  name, xbt_dynar_length(variable->content));
   }
 
-  *val = xbt_dynar_get_as(variable->content, 0, int);
-  return no_error;
+  return xbt_dynar_get_as(variable->content, 0, int);
 }
 
 /** @brief Retrieve a double value of a variable (get a warning if not uniq)
@@ -1051,22 +1007,16 @@ xbt_cfg_get_int   (xbt_cfg_t  cfg,
  * \warning the returned value is the actual content of the config set
  */
 
-xbt_error_t
-xbt_cfg_get_double(xbt_cfg_t  cfg,
-		    const char *name,
-		    double     *val) {
-  xbt_cfgelm_t variable;
-  xbt_error_t  errcode;
-
-  TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_double,&variable));
+double
+xbt_cfg_get_double(xbt_cfg_t  cfg, const char *name) {
+  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_double);
 
   if (xbt_dynar_length(variable->content) > 1) {
     WARN2("You asked for the first value of the config element '%s', but there is %lu values\n",
 	     name, xbt_dynar_length(variable->content));
   }
 
-  *val = xbt_dynar_get_as(variable->content, 0, double);
-  return no_error;
+  return xbt_dynar_get_as(variable->content, 0, double);
 }
 
 /** @brief Retrieve a string value of a variable (get a warning if not uniq)
@@ -1082,23 +1032,15 @@ xbt_cfg_get_double(xbt_cfg_t  cfg,
  * \warning the returned value is the actual content of the config set
  */
 
-xbt_error_t xbt_cfg_get_string(xbt_cfg_t  cfg,
-				 const char *name,
-				 char      **val) {
-  xbt_cfgelm_t  variable;
-  xbt_error_t errcode;
-
-  *val=NULL;
-
-  TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_string,&variable));
+char* xbt_cfg_get_string(xbt_cfg_t  cfg, const char *name) {
+  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_string);
 
   if (xbt_dynar_length(variable->content) > 1) {
     WARN2("You asked for the first value of the config element '%s', but there is %lu values\n",
-	     name, xbt_dynar_length(variable->content));
+	  name, xbt_dynar_length(variable->content));
   }
 
-  *val = xbt_dynar_get_as(variable->content, 0, char *);
-  return no_error;
+  return xbt_dynar_get_as(variable->content, 0, char *);
 }
 
 /** @brief Retrieve an host value of a variable (get a warning if not uniq)
@@ -1115,15 +1057,12 @@ xbt_error_t xbt_cfg_get_string(xbt_cfg_t  cfg,
  * \warning the returned value is the actual content of the config set
  */
 
-xbt_error_t xbt_cfg_get_host  (xbt_cfg_t  cfg,
-				 const char *name,
-				 char      **host,
-				 int        *port) {
+void xbt_cfg_get_host  (xbt_cfg_t   cfg,  const char *name,
+			char      **host, int        *port) {
   xbt_cfgelm_t variable;
-  xbt_error_t  errcode;
   xbt_host_t  *val;
 
-  TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_host,&variable));
+  variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_host);
 
   if (xbt_dynar_length(variable->content) > 1) {
     WARN2("You asked for the first value of the config element '%s', but there is %lu values\n",
@@ -1133,8 +1072,6 @@ xbt_error_t xbt_cfg_get_host  (xbt_cfg_t  cfg,
   val = xbt_dynar_get_as(variable->content, 0, xbt_host_t*);
   *host=val->name;
   *port=val->port;
-  
-  return no_error;
 }
 
 /** @brief Retrieve the dynar of all the values stored in a variable
@@ -1147,87 +1084,58 @@ xbt_error_t xbt_cfg_get_host  (xbt_cfg_t  cfg,
  *
  * \warning the returned value is the actual content of the config set
  */
-xbt_error_t xbt_cfg_get_dynar (xbt_cfg_t    cfg,
-				 const char   *name,
-				 xbt_dynar_t *dynar) {
-  xbt_cfgelm_t variable;
-  xbt_error_t  errcode = xbt_dict_get((xbt_dict_t)cfg,name,
-					(void**)&variable);
-
-  if (errcode == mismatch_error) {
-    ERROR1("No registered variable %s in this config set",
-	   name);
-    return mismatch_error;
+xbt_dynar_t xbt_cfg_get_dynar (xbt_cfg_t    cfg, const char *name) {
+  xbt_cfgelm_t variable=NULL;
+  xbt_ex_t     e;
+
+  TRY {
+    variable = xbt_dict_get((xbt_dict_t)cfg,name);
+  } CATCH(e) {
+    if (e.category == not_found_error) {
+      xbt_ex_free(e);
+      THROW1(not_found_error,0,
+	     "No registered variable %s in this config set",name);
+    }
+    RETHROW;
   }
-  if (errcode != no_error)
-     return errcode;
 
-  *dynar = variable->content;
-  return no_error;
+  return variable->content;
 }
 
 
 /** @brief Retrieve one of the integer value of a variable */
-xbt_error_t
-xbt_cfg_get_int_at(xbt_cfg_t   cfg,
-                   const char *name,
-                   int         pos,
-                   int        *val) {
+int
+xbt_cfg_get_int_at(xbt_cfg_t cfg, const char *name, int pos) {
                   
-  xbt_cfgelm_t variable;
-  xbt_error_t errcode;
-
-  TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_int,&variable));
-  *val = xbt_dynar_get_as(variable->content, pos, int);
-  return no_error; 
+  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_int);
+  return xbt_dynar_get_as(variable->content, pos, int);
 }
 
 /** @brief Retrieve one of the double value of a variable */
-xbt_error_t
-xbt_cfg_get_double_at(xbt_cfg_t   cfg,
-                      const char *name,
-                      int         pos,
-                      double     *val) {
+double
+xbt_cfg_get_double_at(xbt_cfg_t cfg, const char *name, int pos) {
                   
-  xbt_cfgelm_t variable;
-  xbt_error_t errcode;
-
-  TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_double,&variable));
-  *val = xbt_dynar_get_as(variable->content, pos, double);
-  return no_error; 
+  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_double);
+  return xbt_dynar_get_as(variable->content, pos, double);
 }
 
 
 /** @brief Retrieve one of the string value of a variable */
-xbt_error_t
-xbt_cfg_get_string_at(xbt_cfg_t   cfg,
-                      const char *name,
-                      int         pos,
-                      char      **val) {
+char*
+xbt_cfg_get_string_at(xbt_cfg_t cfg, const char *name, int pos) {
                   
-  xbt_cfgelm_t variable;
-  xbt_error_t errcode;
-
-  TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_string,&variable));
-  *val = xbt_dynar_get_as(variable->content, pos, char*);
-  return no_error; 
+  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_string);
+  return xbt_dynar_get_as(variable->content, pos, char*);
 }
 
 /** @brief Retrieve one of the host value of a variable */
-xbt_error_t
-xbt_cfg_get_host_at(xbt_cfg_t   cfg,
-                    const char *name,
-                    int         pos,
-                    char      **host,
-                    int        *port) {
+void
+xbt_cfg_get_host_at(xbt_cfg_t cfg, const char *name, int pos,
+                    char **host, int *port) {
                   
-  xbt_cfgelm_t variable;
-  xbt_error_t errcode;
-  xbt_host_t *val;
+  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_int);
+  xbt_host_t *val = xbt_dynar_get_ptr(variable->content, pos);
 
-  TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_int,&variable));
-  val = xbt_dynar_get_ptr(variable->content, pos);
   *port = val->port;
   *host = val->name;
-  return no_error; 
 }