X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/215ed67257173f5e26c9489ec96c4ced08d1614a..bd6274487954af16de90c357090e2d698d886cd1:/include/xbt/dict.h
diff --git a/include/xbt/dict.h b/include/xbt/dict.h
index daa0a4cef5..a25f957426 100644
--- a/include/xbt/dict.h
+++ b/include/xbt/dict.h
@@ -19,15 +19,9 @@ SG_BEGIN_DECL()
/** @addtogroup XBT_dict
* @brief The dictionnary data structure (comparable to hash tables)
*
- *
Top | [\ref index]::[\ref XBT_API]
- * |
Prev | [\ref XBT_dynar]
- * |
Next | [\ref XBT_set]
- * |
Down | [\ref XBT_dict_cons] |
- *
* This section describes the API to a dictionnary structure that
- * associates as string to a void* key. Even if it provides the same
- * functionnality than an hash table, the implementation differs and the
- * internal data-structure rather looks like a tree.
+ * associates as string to a void* key. It provides the same
+ * functionnality than an hash table.
*
* Here is a little example of use:
* \verbatim xbt_dict_t mydict = xbt_dict_new();
@@ -45,66 +39,54 @@ SG_BEGIN_DECL()
/** @defgroup XBT_dict_cons Dict constructor and destructor
* @ingroup XBT_dict
*
- * Top | [\ref index]::[\ref XBT_API]::[\ref XBT_dict]
- * |
Prev |
- * |
Next | [\ref XBT_dict_basic] |
- *
* @{
*/
/** \brief Dictionnary data type (opaque structure) */
typedef struct xbt_dict_ *xbt_dict_t;
xbt_dict_t xbt_dict_new(void);
+ xbt_dict_t xbt_dict_new_ext(int hashsize);
void xbt_dict_free(xbt_dict_t *dict);
+ void xbt_dict_hashsize_set(xbt_dict_t dict, int hashsize);
/** @} */
/** @defgroup XBT_dict_basic Dictionnaries basic usage
* @ingroup XBT_dict
*
- * Top | [\ref index]::[\ref XBT_API]::[\ref XBT_dict]
- * |
Prev | [\ref XBT_dict_cons]
- * |
Next | [\ref XBT_dict_nnul] |
- *
* Careful, those functions assume that the key is null-terminated.
*
* @{
*/
- void xbt_dict_set(xbt_dict_t head, const char *key, void *data, void_f_pvoid_t *free_ctn);
- void *xbt_dict_get(xbt_dict_t head,const char *key);
+ void xbt_dict_set(xbt_dict_t dict, const char *key, void *data, void_f_pvoid_t *free_ctn);
+ void *xbt_dict_get(xbt_dict_t dict,const char *key);
void *xbt_dict_get_or_null(xbt_dict_t dict, const char *key);
- void xbt_dict_remove(xbt_dict_t head, const char *key);
- void xbt_dict_dump(xbt_dict_t head,void (*output)(void*));
+ void xbt_dict_remove(xbt_dict_t dict, const char *key);
+ void xbt_dict_reset(xbt_dict_t dict);
+ int xbt_dict_length(xbt_dict_t dict);
+ void xbt_dict_dump(xbt_dict_t dict, void (*output)(void*));
/** @} */
/** @defgroup XBT_dict_nnul Dictionnaries with non-nul terminated keys
* @ingroup XBT_dict
*
- * Top | [\ref index]::[\ref XBT_API]::[\ref XBT_dict]
- * |
Prev | [\ref XBT_dict_basic]
- * |
Next | [\ref XBT_dict_curs] |
- *
* Those functions work even with non-null terminated keys.
*
* @{
*/
- void xbt_dict_set_ext(xbt_dict_t head,
+ void xbt_dict_set_ext(xbt_dict_t dict,
const char *key, int key_len,
void *data,
void_f_pvoid_t *free_ctn);
- void *xbt_dict_get_ext(xbt_dict_t head,const char *key, int key_len);
- void xbt_dict_remove_ext(xbt_dict_t head, const char *key, int key_len);
+ void *xbt_dict_get_ext(xbt_dict_t dict, const char *key, int key_len);
+ void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, int key_len);
/** @} */
/** @defgroup XBT_dict_curs Cursors on dictionnaries
* @ingroup XBT_dict
*
- * Top | [\ref index]::[\ref XBT_API]::[\ref XBT_dict]
- * |
Prev | [\ref XBT_dict_nnul]
- * |
Next | [\ref XBT_dict_multi] |
- *
* Don't get impressed, there is a lot of functions here, but traversing a
* dictionnary is imediate with the xbt_dict_foreach macro.
* You only need the other functions in rare cases (they are not used directly in SG itself).
@@ -114,7 +96,7 @@ SG_BEGIN_DECL()
\verbatim xbt_dict_cursor_t cursor=NULL;
char *key,*data;
- xbt_dict_foreach(head,cursor,key,data) {
+ xbt_dict_foreach(dict,cursor,key,data) {
printf(" - Seen: %s->%s\n",key,data);
}\endverbatim
@@ -125,7 +107,7 @@ SG_BEGIN_DECL()
/** @brief Cursor on dictionnaries (opaque type) */
typedef struct xbt_dict_cursor_ *xbt_dict_cursor_t;
- xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t head);
+ xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict);
void xbt_dict_cursor_free(xbt_dict_cursor_t *cursor);
void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor);
@@ -151,10 +133,6 @@ SG_BEGIN_DECL()
/** @defgroup XBT_dict_multi Multi-level dictionnaries
* @ingroup XBT_dict
*
- * Top | [\ref index]::[\ref XBT_API]::[\ref XBT_dict]
- * |
Prev | [\ref XBT_dict_curs]
- * |
Next | |
- *
* They can be seen as dictionnary of multiple keys or as dictionnary of
* dictionnary of ... of data. Most of the functions here work the same way
* than their simple dictionnary counterpart.