X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a9b94bc9be0c3ad5b5f816bf343152a3617a1bc2..3cf22df9688dee5cea0a742b75ffa97bae8bb722:/src/xbt/set.c

diff --git a/src/xbt/set.c b/src/xbt/set.c
index 39c1032111..efada3837e 100644
--- a/src/xbt/set.c
+++ b/src/xbt/set.c
@@ -10,17 +10,14 @@
 #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"
 
 #include "xbt/set.h"
 
-/** \defgroup XBT_set A generic set datatype
-  *  \brief A data container consisting in \ref XBT_dict and \ref XBT_dynar
-  */
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(set,xbt,"data container consisting in dict+dynar");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(set,xbt,
+	     "set: data container consisting in dict+dynar");
 
 /*####[ Type definition ]####################################################*/
 typedef struct xbt_set_ {
@@ -29,12 +26,7 @@ typedef struct xbt_set_ {
 } s_xbt_set_t;
 
 /*####[ Memory  ]############################################################*/
-/**
- * \ingroup XBT_set 
- * \return a new set
- *
- * Creates a new set.
- */
+/** @brief Constructor */
 xbt_set_t xbt_set_new (void) {
   xbt_set_t res=xbt_new(s_xbt_set_t,1);
 
@@ -44,48 +36,53 @@ xbt_set_t xbt_set_new (void) {
   return res;
 }
 
-/**
- * \ingroup XBT_set 
- * \param set
- *
- * Frees a set.
- */
+/** @brief Destructor */
 void  xbt_set_free(xbt_set_t *set) {
   if (*set) {
     xbt_dict_free ( &( (*set)->dict  ) );
     xbt_dynar_free( &( (*set)->dynar ) );
-    xbt_free(*set);
+    free(*set);
     *set = NULL;
   }
 }
 
-/**
- * \ingroup XBT_set 
+/** @brief Add an element to a set. 
+ *
  * \param set set to populate
  * \param elm element to add. 
  * \param free_func How to add the data 
  *
- * Add an element to a set. 
- *
  * elm->name must be set;
- * elm->name_len is used as is unless it's <= 0 (in which case it's recomputed);
+ * if elm->name_len <= 0, it is recomputed. If >0, it's used as is;
  * elm->ID is attributed automatically.
  */
 void xbt_set_add    (xbt_set_t      set,
 		      xbt_set_elm_t  elm,
 		      void_f_pvoid_t *free_func) {
 
-  xbt_error_t   errcode;
-  xbt_set_elm_t found_in_dict;
+  int found = 1;
+  xbt_set_elm_t found_in_dict = NULL;
+  xbt_ex_t e;
 
   if (elm->name_len <= 0) {
     elm->name_len = strlen(elm->name);
   }
 
-  errcode = xbt_dict_get_ext (set->dict, 
-				    elm->name, elm->name_len,
-				    (void**)&found_in_dict);
-  if (errcode == no_error) {
+  TRY {
+    found_in_dict = xbt_dict_get_ext (set->dict, 
+				      elm->name, elm->name_len);
+  } CATCH(e) {
+    if (e.category != not_found_error) 
+      RETHROW;
+    found = 0;
+    elm->ID = xbt_dynar_length( set->dynar );
+    xbt_dict_set_ext(set->dict, elm->name, elm->name_len, elm, free_func);
+    xbt_dynar_set(set->dynar, elm->ID, &elm);
+    DEBUG2("Insertion of key '%s' (id %d)", elm->name, elm->ID);
+    xbt_ex_free(e);
+  }
+  
+  if (found) {
     if (elm == found_in_dict) {
       DEBUG2("Ignoring request to insert the same element twice (key %s ; id %d)",
 	     elm->name, elm->ID);
@@ -97,72 +94,56 @@ void xbt_set_add    (xbt_set_t      set,
       xbt_dynar_set(set->dynar, elm->ID, &elm);
       return;
     }
-  } else {
-    xbt_assert_error(mismatch_error);
   }
-
-  elm->ID = xbt_dynar_length( set->dynar );
-  xbt_dict_set_ext(set->dict, elm->name, elm->name_len, elm, free_func);
-  xbt_dynar_set(set->dynar, elm->ID, &elm);
-  DEBUG2("Insertion of key '%s' (id %d)", elm->name, elm->ID);
-
 }
 
-/**
- * \ingroup XBT_set 
+/** @brief Retrive data by providing its name.
+ * 
  * \param set
  * \param name Name of the searched cell
- * \param dst where to put the found data into
- *
- * get a data stored in the cell by providing its name.
+ * \returns the data you're looking for
  */
-xbt_error_t xbt_set_get_by_name    (xbt_set_t     set,
-				      const char     *name,
-				      /* OUT */xbt_set_elm_t *dst) {
-  xbt_error_t errcode;
-  errcode = xbt_dict_get_ext(set->dict, name, strlen(name), (void**) dst);
-  DEBUG2("Lookup key %s: %s",name,xbt_error_name(errcode));
-  return errcode;
+xbt_set_elm_t xbt_set_get_by_name    (xbt_set_t     set,
+				      const char     *name) {
+  DEBUG1("Lookup key %s",name);
+  return xbt_dict_get_ext(set->dict, name, strlen(name));
 }
-/**
- * \ingroup XBT_set 
+
+/** @brief Retrive data by providing its name and the length of the name
+ *
  * \param set
  * \param name Name of the searched cell
  * \param name_len length of the name, when strlen cannot be trusted
- * \param dst where to put the found data into
+ * \returns the data you're looking for
  *
- * get a data stored in the cell by providing its name (and the length
- * of the name, when strlen cannot be trusted because you don't use a char*
- * as name, you weird guy).
+ * This is useful when strlen cannot be trusted because you don't use a char*
+ * as name, you weirdo.
  */
-xbt_error_t xbt_set_get_by_name_ext(xbt_set_t      set,
+xbt_set_elm_t xbt_set_get_by_name_ext(xbt_set_t      set,
 				      const char     *name,
-				      int             name_len,
-				      /* OUT */xbt_set_elm_t *dst) {
+				      int             name_len) {
 
-  return xbt_dict_get_ext (set->dict, name, name_len, (void**)dst);
+  return xbt_dict_get_ext (set->dict, name, name_len);
 }
 
-/**
- * \ingroup XBT_set 
+/** @brief Retrive data by providing its ID
+ *
  * \param set
  * \param id what you're looking for
- * \param dst where to put the found data into
+ * \returns the data you're looking for
  *
- * get a data stored in the cell by providing its id. 
  * @warning, if the ID does not exists, you're getting into trouble
  */
-xbt_error_t xbt_set_get_by_id      (xbt_set_t      set,
-				      int             id,
-				      /* OUT */xbt_set_elm_t *dst) {
-
+xbt_set_elm_t xbt_set_get_by_id (xbt_set_t set, int id) {
+  xbt_set_elm_t res;
+  
   /* Don't bother checking the bounds, the dynar does so */
 
-  *dst = xbt_dynar_get_as(set->dynar,id,xbt_set_elm_t);
+  res = xbt_dynar_get_as(set->dynar,id,xbt_set_elm_t);
   DEBUG3("Lookup type of id %d (of %lu): %s", 
-	 id, xbt_dynar_length(set->dynar), (*dst)->name);
+	 id, xbt_dynar_length(set->dynar), res->name);
   
-  return no_error;
+  return res;
 }
 
 /***
@@ -173,13 +154,7 @@ typedef struct xbt_set_cursor_ {
   int val;
 } s_xbt_set_cursor_t;
 
-/**
- * \ingroup XBT_set 
- * \param set on what to let the cursor iterate
- * \param cursor dest address
- *
- * Create the cursor if it does not exists. Rewind it in any case.
- */
+/** @brief Create the cursor if it does not exists, rewind it in any case. */
 void         xbt_set_cursor_first       (xbt_set_t         set,
 					  xbt_set_cursor_t *cursor) {
 
@@ -197,23 +172,14 @@ void         xbt_set_cursor_first       (xbt_set_t         set,
   }
 }
 
-/**
- * \ingroup XBT_set 
- * \param cursor the cursor
- *
- * Move to the next element. 
- */
+/** @brief Move to the next element.  */
 void         xbt_set_cursor_step        (xbt_set_cursor_t cursor) {
   xbt_dynar_cursor_step(cursor->set->dynar, &( cursor->val ) );
 }
 
-/**
- * \ingroup XBT_set 
- * \param curs the cursor
- * \param elm an element
+/** @brief Get current data
+ * 
  * \return true if it's ok, false if there is no more data
- *
- * Get current data
  */
 int          xbt_set_cursor_get_or_free (xbt_set_cursor_t *curs,
 					  xbt_set_elm_t    *elm) {
@@ -225,7 +191,7 @@ int          xbt_set_cursor_get_or_free (xbt_set_cursor_t *curs,
   cursor=*curs;
 
   if (! xbt_dynar_cursor_get( cursor->set->dynar,&(cursor->val),elm) ) {
-    xbt_free(cursor);
+    free(cursor);
     *curs=NULL;
     return FALSE;    
   }