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
[trace] avoiding key clashes on paje links
[simgrid.git]
/
src
/
xbt
/
dict.c
diff --git
a/src/xbt/dict.c
b/src/xbt/dict.c
index
06be987
..
f52f98b
100644
(file)
--- a/
src/xbt/dict.c
+++ b/
src/xbt/dict.c
@@
-166,7
+166,7
@@
XBT_INLINE void xbt_dict_set_ext(xbt_dict_t dict,
void *data, void_f_pvoid_t free_ctn)
{
void *data, void_f_pvoid_t free_ctn)
{
- unsigned int hash_code = xbt_
dict
_hash_ext(key, key_len);
+ unsigned int hash_code = xbt_
str
_hash_ext(key, key_len);
xbt_dictelm_t current, previous = NULL;
xbt_assert(dict);
xbt_dictelm_t current, previous = NULL;
xbt_assert(dict);
@@
-237,7
+237,7
@@
XBT_INLINE void *xbt_dict_get_ext(xbt_dict_t dict, const char *key,
{
{
- unsigned int hash_code = xbt_
dict
_hash_ext(key, key_len);
+ unsigned int hash_code = xbt_
str
_hash_ext(key, key_len);
xbt_dictelm_t current;
xbt_assert(dict);
xbt_dictelm_t current;
xbt_assert(dict);
@@
-262,7
+262,7
@@
void *xbt_dict_get_or_null_ext(xbt_dict_t dict, const char *key,
int key_len)
{
int key_len)
{
- unsigned int hash_code = xbt_
dict
_hash_ext(key, key_len);
+ unsigned int hash_code = xbt_
str
_hash_ext(key, key_len);
xbt_dictelm_t current;
xbt_assert(dict);
xbt_dictelm_t current;
xbt_assert(dict);
@@
-317,7
+317,7
@@
char *xbt_dict_get_key(xbt_dict_t dict, const void *data)
XBT_INLINE void *xbt_dict_get(xbt_dict_t dict, const char *key)
{
XBT_INLINE void *xbt_dict_get(xbt_dict_t dict, const char *key)
{
- unsigned int hash_code = xbt_
dict
_hash(key);
+ unsigned int hash_code = xbt_
str
_hash(key);
xbt_dictelm_t current;
xbt_assert(dict);
xbt_dictelm_t current;
xbt_assert(dict);
@@
-338,7
+338,7
@@
XBT_INLINE void *xbt_dict_get(xbt_dict_t dict, const char *key)
*/
XBT_INLINE void *xbt_dict_get_or_null(xbt_dict_t dict, const char *key)
{
*/
XBT_INLINE void *xbt_dict_get_or_null(xbt_dict_t dict, const char *key)
{
- unsigned int hash_code = xbt_
dict
_hash(key);
+ unsigned int hash_code = xbt_
str
_hash(key);
xbt_dictelm_t current;
xbt_assert(dict);
xbt_dictelm_t current;
xbt_assert(dict);
@@
-369,7
+369,7
@@
XBT_INLINE void xbt_dict_remove_ext(xbt_dict_t dict, const char *key,
{
{
- unsigned int hash_code = xbt_
dict
_hash_ext(key, key_len);
+ unsigned int hash_code = xbt_
str
_hash_ext(key, key_len);
xbt_dictelm_t current, previous = NULL;
xbt_assert(dict);
xbt_dictelm_t current, previous = NULL;
xbt_assert(dict);
@@
-608,12
+608,6
@@
void xbt_dict_dump_sizes(xbt_dict_t dict)
*/
void xbt_dict_preinit(void)
{
*/
void xbt_dict_preinit(void)
{
- if (dict_elm_mallocator != NULL) {
- /* Already created. I guess we want to switch to MC mode, so kill the previously created mallocator */
- xbt_mallocator_free(dict_elm_mallocator);
- xbt_mallocator_free(dict_het_elm_mallocator);
- }
-
dict_elm_mallocator = xbt_mallocator_new(256,
dict_elm_mallocator_new_f,
dict_elm_mallocator_free_f,
dict_elm_mallocator = xbt_mallocator_new(256,
dict_elm_mallocator_new_f,
dict_elm_mallocator_free_f,