X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/25d5daee59894589a8454b998c85202c71b01305..6af11f57f8a7fc1e6694ce8226db505c7bcaa00e:/src/xbt/dict_private.h diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h index c25f8d939f..490fe38cbb 100644 --- a/src/xbt/dict_private.h +++ b/src/xbt/dict_private.h @@ -27,11 +27,15 @@ typedef struct s_xbt_dictelm { unsigned int hash_code; void *content; - void_f_pvoid_t free_f; xbt_dictelm_t next; } s_xbt_dictelm_t; +typedef struct s_xbt_het_dictelm { + s_xbt_dictelm_t element; + void_f_pvoid_t free_f; +} s_xbt_het_dictelm_t, *xbt_het_dictelm_t; + typedef struct s_xbt_dict { void_f_pvoid_t free_f; xbt_dictelm_t *table; @@ -48,10 +52,17 @@ extern void *dict_elm_mallocator_new_f(void); #define dict_elm_mallocator_free_f xbt_free_f #define dict_elm_mallocator_reset_f ((void_f_pvoid_t)NULL) +extern xbt_mallocator_t dict_het_elm_mallocator; +extern void *dict_het_elm_mallocator_new_f(void); +#define dict_het_elm_mallocator_free_f xbt_free_f +#define dict_het_elm_mallocator_reset_f ((void_f_pvoid_t)NULL) + /*####[ Function prototypes ]################################################*/ -xbt_dictelm_t xbt_dictelm_new(const char *key, int key_len, +xbt_dictelm_t xbt_dictelm_new(xbt_dict_t dict, 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_dictelm_free(xbt_dict_t dict, xbt_dictelm_t element); +void xbt_dictelm_set_data(xbt_dict_t dict, xbt_dictelm_t element, + void *data, void_f_pvoid_t free_ctn); #endif /* _XBT_DICT_PRIVATE_H_ */