A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model-checker : warnings fixed
[simgrid.git]
/
src
/
xbt
/
dict_private.h
diff --git
a/src/xbt/dict_private.h
b/src/xbt/dict_private.h
index
b403501
..
490fe38
100644
(file)
--- a/
src/xbt/dict_private.h
+++ b/
src/xbt/dict_private.h
@@
-27,16
+27,22
@@
typedef struct s_xbt_dictelm {
unsigned int hash_code;
void *content;
unsigned int hash_code;
void *content;
- void_f_pvoid_t free_f;
xbt_dictelm_t next;
} s_xbt_dictelm_t;
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 {
typedef struct s_xbt_dict {
+ void_f_pvoid_t free_f;
xbt_dictelm_t *table;
int table_size;
int count;
int fill;
xbt_dictelm_t *table;
int table_size;
int count;
int fill;
+ int homogeneous;
} s_xbt_dict_t;
typedef struct s_xbt_dict_cursor s_xbt_dict_cursor_t;
} s_xbt_dict_t;
typedef struct s_xbt_dict_cursor s_xbt_dict_cursor_t;
@@
-46,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)
#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 ]################################################*/
/*####[ 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);
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_ */
#endif /* _XBT_DICT_PRIVATE_H_ */