X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/85897b1307bb68f05f31385803f1b3a5b806a73f..bb6ac9c6781e2639da8957ccf08957974d6ce697:/src/xbt/config.c

diff --git a/src/xbt/config.c b/src/xbt/config.c
index 0dadc2f331..1b13546ebf 100644
--- a/src/xbt/config.c
+++ b/src/xbt/config.c
@@ -9,16 +9,18 @@
 /* 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 <stdio.h>
 #include "xbt/misc.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/ex.h"
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
+#include "xbt/peer.h"
 
 #include "xbt/config.h" /* prototypes of this module */
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(config,xbt,"configuration support");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg,xbt,"configuration support");
 
 /* xbt_cfgelm_t: the typedef corresponding to a config variable. 
 
@@ -35,12 +37,12 @@ typedef struct {
   xbt_cfg_cb_t cb_rm;
 
   /* actual content 
-     (cannot be an union because type host uses both str and i) */
+     (cannot be an union because type peer uses both str and i) */
   xbt_dynar_t content;
 } s_xbt_cfgelm_t,*xbt_cfgelm_t;
 
 static const char *xbt_cfgelm_type_name[xbt_cfgelm_type_count]=
-  {"int","double","string","host","any"};
+  {"int","double","string","peer","any"};
 
 /* Internal stuff used in cache to free a variable */
 static void xbt_cfgelm_free(void *data);
@@ -49,17 +51,6 @@ static void xbt_cfgelm_free(void *data);
 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);
-}
-static void xbt_cfg_host_free(void *d){
-  xbt_host_t *h=(xbt_host_t*) *(void**)d; 
-  if (h) {
-    if (h->name) free(h->name);
-    free(h);
-  }
-}
-
 /*----[ Memory management ]-----------------------------------------------*/
 
 /** @brief Constructor
@@ -86,6 +77,7 @@ xbt_cfg_cpy(xbt_cfg_t tocopy,xbt_cfg_t *whereto) {
   xbt_cfgelm_t variable=NULL;
   char *name=NULL;
   
+  DEBUG1("Copy cfg set %p",tocopy);
   *whereto=NULL;
   xbt_assert0(tocopy,"cannot copy NULL config");
 
@@ -97,6 +89,7 @@ xbt_cfg_cpy(xbt_cfg_t tocopy,xbt_cfg_t *whereto) {
 
 /** @brief Destructor */
 void xbt_cfg_free(xbt_cfg_t *cfg) {
+  DEBUG1("Frees cfg set %p",cfg);
   xbt_dict_free((xbt_dict_t*)cfg);
 }
 
@@ -116,7 +109,7 @@ void xbt_cfg_dump(const char *name,const char *indent,xbt_cfg_t cfg) {
   int ival;
   char *sval;
   double dval;
-  xbt_host_t *hval;
+  xbt_peer_t hval;
 
   if (name)
     printf("%s>> Dumping of the config set '%s':\n",indent,name);
@@ -153,9 +146,9 @@ void xbt_cfg_dump(const char *name,const char *indent,xbt_cfg_t cfg) {
       }
       break;
 
-    case xbt_cfgelm_host:
+    case xbt_cfgelm_peer:
       for (i=0; i<size; i++) {
-	hval = xbt_dynar_get_as(variable->content,i,xbt_host_t*);
+	hval = xbt_dynar_get_as(variable->content,i,xbt_peer_t);
 	printf ("%s    %s:%d\n",indent,hval->name,hval->port);
       }
       break;
@@ -180,6 +173,7 @@ void xbt_cfg_dump(const char *name,const char *indent,xbt_cfg_t cfg) {
 void xbt_cfgelm_free(void *data) {
   xbt_cfgelm_t c=(xbt_cfgelm_t)data;
 
+  DEBUG1("Frees cfgelm %p",c);
   if (!c) return;
   xbt_dynar_free(&(c->content));
   free(c);
@@ -201,32 +195,21 @@ xbt_cfg_register(xbt_cfg_t cfg,
 		 int min, int max,
 		 xbt_cfg_cb_t cb_set,  xbt_cfg_cb_t cb_rm){
   xbt_cfgelm_t res;
-  xbt_ex_t e;
-  int found=0;
 
   xbt_assert(cfg);
-  xbt_assert4(type>=xbt_cfgelm_int && type<=xbt_cfgelm_host,
+  xbt_assert4(type>=xbt_cfgelm_int && type<=xbt_cfgelm_peer,
               "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;
-    }
-  }
+              name,type,xbt_cfgelm_int, xbt_cfgelm_peer);
+  res = xbt_dict_get_or_null((xbt_dict_t)cfg,name);
 
-  if (!found) {
+  if (res) {
     WARN1("Config elem %s registered twice.",name);
     /* Will be removed by the insertion of the new one */
   } 
 
   res=xbt_new(s_xbt_cfgelm_t,1);
+  DEBUG7("Register cfg elm %s (%d to %d %s (=%d) @%p in set %p)",
+	 name,min,max,xbt_cfgelm_type_name[type],type,res,cfg);
 
   res->type=type;
   res->min=min;
@@ -244,11 +227,11 @@ xbt_cfg_register(xbt_cfg_t cfg,
     break;
 
   case xbt_cfgelm_string:
-   res->content = xbt_dynar_new(sizeof(char*),&xbt_cfg_str_free);
+   res->content = xbt_dynar_new(sizeof(char*),xbt_free_ref);
    break;
 
-  case xbt_cfgelm_host:
-   res->content = xbt_dynar_new(sizeof(xbt_host_t*),&xbt_cfg_host_free);
+  case xbt_cfgelm_peer:
+   res->content = xbt_dynar_new(sizeof(xbt_peer_t),xbt_peer_free_voidp);
    break;
 
   default:
@@ -269,6 +252,7 @@ xbt_cfg_register(xbt_cfg_t cfg,
 
 void
 xbt_cfg_unregister(xbt_cfg_t cfg,const char *name) {
+  DEBUG2("Unregister elm '%s' from set %p",name,cfg);
   xbt_dict_remove((xbt_dict_t)cfg,name);
 }
 
@@ -280,7 +264,7 @@ xbt_cfg_unregister(xbt_cfg_t cfg,const char *name) {
  *
  * The string may consist in several variable descriptions separated by a space. 
  * Each of them must use the following syntax: \<name\>:\<min nb\>_to_\<max nb\>_\<type\>
- * with type being one of  'string','int', 'host' or 'double'.
+ * with type being one of  'string','int', 'peer' or 'double'.
  */
 
 void
@@ -290,6 +274,7 @@ xbt_cfg_register_str(xbt_cfg_t cfg,const char *entry) {
 
   int min,max;
   e_xbt_cfgelm_type_t type;
+  DEBUG1("Register string '%s'",entry);
 
   tok=strchr(entrycpy, ':');
   xbt_assert2(tok,"Invalid config element descriptor: %s%s",
@@ -318,7 +303,7 @@ xbt_cfg_register_str(xbt_cfg_t cfg,const char *entry) {
        type++);
   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'.");
+	  "; Should be one of 'string', 'int', 'peer' or 'double'.");
 
   xbt_cfg_register(cfg,entrycpy,type,min,max,NULL,NULL);
 
@@ -335,6 +320,7 @@ xbt_cfg_check(xbt_cfg_t cfg) {
   int size;
 
   xbt_assert0(cfg,"NULL config set.");
+  DEBUG1("Check cfg set %p",cfg);
 
   xbt_dict_foreach((xbt_dict_t)cfg,cursor,name,variable) {
     size = xbt_dynar_length(variable->content);
@@ -366,18 +352,11 @@ 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;
-  }
+  res = xbt_dict_get_or_null((xbt_dict_t)cfg,name);
+  if (!res)
+    THROW1(not_found_error,0,
+	   "No registered variable '%s' in this config set",name);
 
   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.",
@@ -400,18 +379,11 @@ e_xbt_cfgelm_type_t
 xbt_cfg_get_type(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,
-	     "Can't get the type of '%s' since this variable does not exist",name);
-    }
-    RETHROW;
-  }
+  variable = xbt_dict_get_or_null((xbt_dict_t)cfg,name);
+  if (!variable)
+    THROW1(not_found_error,0,
+	   "Can't get the type of '%s' since this variable does not exist",name);
 
   INFO1("type in variable = %d",variable->type);
 
@@ -447,10 +419,10 @@ xbt_cfg_set_vargs(xbt_cfg_t cfg, const char *name, va_list pa) {
   }
 
   switch (type) {
-  case xbt_cfgelm_host:
+  case xbt_cfgelm_peer:
     str = va_arg(pa, char *);
     i=va_arg(pa,int);
-    xbt_cfg_set_host(cfg,name,str,i);
+    xbt_cfg_set_peer(cfg,name,str,i);
     break;
       
   case xbt_cfgelm_string:
@@ -615,13 +587,13 @@ xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
 	xbt_cfg_set_double(cfg,name,d); /* throws */
 	break;
 
-      case xbt_cfgelm_host:
+      case xbt_cfgelm_peer:
 	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)",
+		      "Value of option %s not valid. Should be an peer (machine:port)",
 		      name);
 	}
 	
@@ -630,11 +602,11 @@ xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
 	if (val==NULL) {
 	  free(optionlist_cpy);	
 	  xbt_assert1(FALSE,
-		      "Value of option %s not valid. Should be an host (machine:port)",
+		      "Value of option %s not valid. Should be an peer (machine:port)",
 		      name);
 	}
 
-	xbt_cfg_set_host(cfg,name,str,i); /* throws */ 
+	xbt_cfg_set_peer(cfg,name,str,i); /* throws */ 
 	break;      
 
       default: 
@@ -668,7 +640,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)
+    if (variable->max && xbt_dynar_length(variable->content) == (unsigned long)variable->max)
       THROW3(mismatch_error,0,
              "Cannot add value %d to the config element %s since it's already full (size=%d)",
              val,name,variable->max); 
@@ -727,10 +699,18 @@ xbt_cfg_set_string(xbt_cfg_t cfg,const char*name, const char*val) {
 
   VERB2("Configuration setting: %s=%s",name,val);
   variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_string);
+  DEBUG5("Variable: %d to %d %s (=%d) @%p",
+	 variable->min,variable->max,xbt_cfgelm_type_name[variable->type],variable->type,variable);
 
   if (variable->max == 1) {
-    if (variable->cb_rm && xbt_dynar_length(variable->content))
-      (*variable->cb_rm)(name, 0);
+    if (xbt_dynar_length(variable->content)) {
+       if (variable->cb_rm)
+	 (*variable->cb_rm)(name, 0);
+       else if (variable->type == xbt_cfgelm_string) {
+	 char * sval=xbt_dynar_get_as(variable->content,0,char*);
+	 free(sval);
+       }
+    }
           
     xbt_dynar_set(variable->content,0,&newval);
   } else {
@@ -746,28 +726,25 @@ xbt_cfg_set_string(xbt_cfg_t cfg,const char*name, const char*val) {
     (*variable->cb_set)(name, xbt_dynar_length(variable->content) -1);
 }
 
-/** @brief Set or add an host value to \a name within \a cfg
+/** @brief Set or add an peer value to \a name within \a cfg
  * 
  * \arg cfg the config set
  * \arg name the name of the variable
- * \arg host the host
+ * \arg peer the peer
  * \arg port the port number
  *
- * \e host values are composed of a string (hostname) and an integer (port)
+ * \e peer values are composed of a string (peername) and an integer (port)
  */ 
 
 void
-xbt_cfg_set_host(xbt_cfg_t cfg,const char*name, 
-		  const char *host,int port) {
+xbt_cfg_set_peer(xbt_cfg_t cfg,const char*name, 
+		  const char *peer,int port) {
   xbt_cfgelm_t variable;
-  xbt_host_t *val=xbt_new(xbt_host_t,1);
+  xbt_peer_t val=xbt_peer_new(peer,port);
 
-  VERB3("Configuration setting: %s=%s:%d",name,host,port);
+  VERB3("Configuration setting: %s=%s:%d",name,peer,port);
 
-  val->name = xbt_strdup(name);
-  val->port = port;
-
-  variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_host);
+  variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_peer);
 
   if (variable->max == 1) {
     if (variable->cb_rm && xbt_dynar_length(variable->content))
@@ -778,7 +755,7 @@ xbt_cfg_set_host(xbt_cfg_t cfg,const char*name,
     if (variable->max && xbt_dynar_length(variable->content) == variable->max)
       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); 
+             peer,port,name,variable->max); 
              
     xbt_dynar_push(variable->content,&val);
   }
@@ -798,7 +775,8 @@ xbt_cfg_set_host(xbt_cfg_t cfg,const char*name,
 void xbt_cfg_rm_int(xbt_cfg_t cfg,const char*name, int val) {
 
   xbt_cfgelm_t variable;
-  int cpt,seen;
+  unsigned int cpt;
+  int seen;
 
   variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_int);
   
@@ -828,7 +806,7 @@ void xbt_cfg_rm_int(xbt_cfg_t cfg,const char*name, int val) {
 
 void xbt_cfg_rm_double(xbt_cfg_t cfg,const char*name, double val) {
   xbt_cfgelm_t variable;
-  int cpt;
+  unsigned int cpt;
   double seen;
 
   variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_double);
@@ -860,7 +838,7 @@ void xbt_cfg_rm_double(xbt_cfg_t cfg,const char*name, double val) {
 void
 xbt_cfg_rm_string(xbt_cfg_t cfg,const char*name, const char *val) {
   xbt_cfgelm_t variable;
-  int cpt;
+  unsigned int cpt;
   char *seen;
 
   variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_string);
@@ -883,29 +861,29 @@ xbt_cfg_rm_string(xbt_cfg_t cfg,const char*name, const char *val) {
 	 "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
+/** @brief Remove the provided \e val peer value from a variable
  * 
  * \arg cfg the config set
  * \arg name the name of the variable
- * \arg host the hostname
+ * \arg peer the peername
  * \arg port the port number
  */
 
 void
-xbt_cfg_rm_host(xbt_cfg_t cfg,const char*name, const char *host,int port) {
+xbt_cfg_rm_peer(xbt_cfg_t cfg,const char*name, const char *peer,int port) {
   xbt_cfgelm_t variable;
-  int cpt;
-  xbt_host_t *seen;
+  unsigned int cpt;
+  xbt_peer_t seen;
 
-  variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_host);
+  variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_peer);
   
   if (xbt_dynar_length(variable->content) == variable->min)
     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); 
+           peer,port,name,variable->min); 
            
   xbt_dynar_foreach(variable->content,cpt,seen) {
-    if (!strcpy(seen->name,host) && seen->port == port) {
+    if (!strcpy(seen->name,peer) && seen->port == port) {
       if (variable->cb_rm) (*variable->cb_rm)(name, cpt);
       xbt_dynar_cursor_rm(variable->content,&cpt);
       return;
@@ -914,7 +892,7 @@ xbt_cfg_rm_host(xbt_cfg_t cfg,const char*name, const char *host,int port) {
 
   THROW3(not_found_error,0,
 	 "Can't remove the value %s:%d of config element %s: value not found.",
-	 host,port,name);
+	 peer,port,name);
 }
 
 /** @brief Remove the \e pos th value from the provided variable */
@@ -958,7 +936,7 @@ xbt_cfg_empty(xbt_cfg_t cfg,const char*name) {
 
   if (variable) {
     if (variable->cb_rm) {
-      int cpt;
+      unsigned int cpt;
       void *ignored;
       xbt_dynar_foreach(variable->content,cpt,ignored) {
         (*variable->cb_rm)(name, cpt);
@@ -1043,11 +1021,11 @@ char* xbt_cfg_get_string(xbt_cfg_t  cfg, const char *name) {
   return xbt_dynar_get_as(variable->content, 0, char *);
 }
 
-/** @brief Retrieve an host value of a variable (get a warning if not uniq)
+/** @brief Retrieve an peer value of a variable (get a warning if not uniq)
  *
  * \arg cfg the config set
  * \arg name the name of the variable
- * \arg host the host
+ * \arg peer the peer
  * \arg port the port number
  *
  * Returns the first value from the config set under the given name.
@@ -1057,20 +1035,20 @@ char* xbt_cfg_get_string(xbt_cfg_t  cfg, const char *name) {
  * \warning the returned value is the actual content of the config set
  */
 
-void xbt_cfg_get_host  (xbt_cfg_t   cfg,  const char *name,
-			char      **host, int        *port) {
+void xbt_cfg_get_peer  (xbt_cfg_t   cfg,  const char *name,
+			char      **peer, int        *port) {
   xbt_cfgelm_t variable;
-  xbt_host_t  *val;
+  xbt_peer_t  val;
 
-  variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_host);
+  variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_peer);
 
   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, xbt_host_t*);
-  *host=val->name;
+  val = xbt_dynar_get_as(variable->content, 0, xbt_peer_t);
+  *peer=val->name;
   *port=val->port;
 }
 
@@ -1128,16 +1106,16 @@ xbt_cfg_get_string_at(xbt_cfg_t cfg, const char *name, int pos) {
   return xbt_dynar_get_as(variable->content, pos, char*);
 }
 
-/** @brief Retrieve one of the host value of a variable */
+/** @brief Retrieve one of the peer value of a variable */
 void
-xbt_cfg_get_host_at(xbt_cfg_t cfg, const char *name, int pos,
-                    char **host, int *port) {
+xbt_cfg_get_peer_at(xbt_cfg_t cfg, const char *name, int pos,
+                    char **peer, int *port) {
                   
   xbt_cfgelm_t variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_int);
-  xbt_host_t *val = xbt_dynar_get_ptr(variable->content, pos);
+  xbt_peer_t val = xbt_dynar_get_ptr(variable->content, pos);
 
   *port = val->port;
-  *host = val->name;
+  *peer = val->name;
 }
 
 
@@ -1152,7 +1130,7 @@ static xbt_cfg_t make_set(){
 
   set = xbt_cfg_new();
   xbt_cfg_register_str(set,"speed:1_to_2_int");
-  xbt_cfg_register_str(set,"hostname:1_to_1_string");
+  xbt_cfg_register_str(set,"peername:1_to_1_string");
   xbt_cfg_register_str(set,"user:1_to_10_string");
 
   return set;
@@ -1161,7 +1139,7 @@ static xbt_cfg_t make_set(){
 XBT_TEST_UNIT("memuse",test_config_memuse,"Alloc and free a config set") {
   xbt_cfg_t set=make_set();
   xbt_test_add0("Alloc and free a config set");
-  xbt_cfg_set_parse(set, "hostname:veloce user:mquinson\nuser:oaumage\tuser:alegrand");
+  xbt_cfg_set_parse(set, "peername:veloce user:mquinson\nuser:oaumage\tuser:alegrand");
   xbt_cfg_free(&set);
   xbt_cfg_free(&set);
 }
@@ -1171,7 +1149,7 @@ XBT_TEST_UNIT("validation",test_config_validation,"Validation tests") {
   xbt_ex_t e;
   
   xbt_test_add0("Having too few elements for speed");
-  xbt_cfg_set_parse(set, "hostname:veloce user:mquinson\nuser:oaumage\tuser:alegrand");
+  xbt_cfg_set_parse(set, "peername:veloce user:mquinson\nuser:oaumage\tuser:alegrand");
   TRY {
     xbt_cfg_check(set);
   } CATCH(e) {
@@ -1187,7 +1165,7 @@ XBT_TEST_UNIT("validation",test_config_validation,"Validation tests") {
 
   xbt_test_add0("Having too much values of 'speed'");
   set=make_set(); 
-  xbt_cfg_set_parse(set,"hostname:toto:42 user:alegrand");
+  xbt_cfg_set_parse(set,"peername:toto:42 user:alegrand");
   TRY {
     xbt_cfg_set_parse(set,"speed:42 speed:24 speed:34");
   } CATCH(e) {
@@ -1204,8 +1182,6 @@ XBT_TEST_UNIT("validation",test_config_validation,"Validation tests") {
 }
 
 XBT_TEST_UNIT("use",test_config_use,"Data retrieving tests") {
-  xbt_cfg_t set = set=make_set();
- 
 
   xbt_test_add0("Get a single value");
   {	
@@ -1213,7 +1189,7 @@ XBT_TEST_UNIT("use",test_config_use,"Data retrieving tests") {
     int ival;
     xbt_cfg_t myset=make_set();
     
-    xbt_cfg_set_parse(myset,"hostname:toto:42 speed:42");
+    xbt_cfg_set_parse(myset,"peername:toto:42 speed:42");
     ival = xbt_cfg_get_int(myset,"speed"); 
     if (ival != 42) 
       xbt_test_fail1("Speed value = %d, I expected 42",ival);
@@ -1226,13 +1202,13 @@ XBT_TEST_UNIT("use",test_config_use,"Data retrieving tests") {
     xbt_dynar_t dyn; 
     xbt_cfg_t myset=make_set();
     
-    xbt_cfg_set_parse(myset, "hostname:veloce user:foo\nuser:bar\tuser:toto");
+    xbt_cfg_set_parse(myset, "peername:veloce user:foo\nuser:bar\tuser:toto");
     xbt_cfg_set_parse(myset,"speed:42");
     xbt_cfg_check(myset); 
     dyn = xbt_cfg_get_dynar(myset,"user");
 
     if (xbt_dynar_length(dyn) != 3) 
-      xbt_test_fail1("Dynar length = %d, I expected 3", (int)xbt_dynar_length(dyn));
+      xbt_test_fail1("Dynar length = %lu, I expected 3", xbt_dynar_length(dyn));
 
     if (strcmp(xbt_dynar_get_as(dyn,0,char*),"foo"))
       xbt_test_fail1("Dynar[0] = %s, I expected foo",   xbt_dynar_get_as(dyn,0,char*));
@@ -1249,11 +1225,12 @@ XBT_TEST_UNIT("use",test_config_use,"Data retrieving tests") {
   {	
     /* non-existant_entry */
     xbt_cfg_t myset=make_set();
+    xbt_ex_t e;
     
     TRY {
       xbt_cfg_set_parse(myset, "color:blue");
     } CATCH(e) {
-      if (e.category != mismatch_error)
+      if (e.category != not_found_error)
         xbt_test_exception(e);
       xbt_ex_free(e);
     }