/* 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. */
-#ifndef _XBT_DICT_ELM_T_
-#define _XBT_DICT_ELM_T_
+#ifndef _XBT_DICT_PRIVATE_H__
+#define _XBT_DICT_PRIVATE_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/mallocator.h"
-/*####[ Type definition ]####################################################*/
-typedef struct xbt_dictelm_ {
- char *key;
- int key_len;
- int offset; /* offset on the key */
- void *content;
- void_f_pvoid_t *free_f; /*pointer to the function to call to free this ctn*/
+typedef struct xbt_dictelm_ *xbt_dictelm_t;
- xbt_dynar_t sub; /* sub */
-} s_xbt_dictelm_t, *xbt_dictelm_t;
+#define MAX_FILL_PERCENT 80
-typedef struct xbt_dict_ {
- s_xbt_dictelm_t *head;
+typedef struct xbt_dictelm_ {
+ char *key;
+ int key_len;
+ unsigned int hash_code;
+
+ void *content;
+ void_f_pvoid_t free_f;
+
+ xbt_dictelm_t next;
+} s_xbt_dictelm_t;
+
+typedef struct xbt_dict_s {
+ xbt_dictelm_t *table;
+ int table_size;
+ int count;
+ int fill;
} s_xbt_dict_t;
typedef struct xbt_dict_cursor_ s_xbt_dict_cursor_t;
-/*####[ Function prototypes ]################################################*/
-void xbt_dictelm_free (s_xbt_dictelm_t **pp_elm);
-
-void xbt_dictelm_set (s_xbt_dictelm_t **pp_head,
- const char *_key,
- void *data,
- void_f_pvoid_t *free_ctn);
-void xbt_dictelm_set_ext (s_xbt_dictelm_t **pp_head,
- const char *_key,
- int key_len,
- void *data,
- void_f_pvoid_t *free_ctn);
-
-xbt_error_t xbt_dictelm_get (s_xbt_dictelm_t *p_head,
- const char *key,
- /* OUT */void **data);
-xbt_error_t xbt_dictelm_get_ext (s_xbt_dictelm_t *p_head,
- const char *key,
- int key_len,
- /* OUT */void **data);
+extern xbt_mallocator_t dict_elm_mallocator;
+extern void* dict_elm_mallocator_new_f(void);
+extern void dict_elm_mallocator_free_f(void* elem);
+extern void dict_elm_mallocator_reset_f(void* elem);
-xbt_error_t xbt_dictelm_remove (s_xbt_dictelm_t *p_head,
- const char *key);
-xbt_error_t xbt_dictelm_remove_ext(s_xbt_dictelm_t *p_head,
- const char *key,
- int key_len);
-
-void xbt_dictelm_dump (s_xbt_dictelm_t *p_head,
- void_f_pvoid_t *output);
-
-void xbt_dictelm_print_fct (void *data);
-
-#endif /* _XBT_DICT_ELM_T_ */
+/*####[ Function prototypes ]################################################*/
+xbt_dictelm_t xbt_dictelm_new(const char *key, int key_len, unsigned int hash_code,
+ void *content, void_f_pvoid_t free_f);
+void xbt_dictelm_free(xbt_dictelm_t element);
+void xbt_dict_add_element(xbt_dict_t dict, xbt_dictelm_t element);
+#endif /* _XBT_DICT_PRIVATE_H_ */
