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
Add a dict parameter to dictelm functions.
[simgrid.git]
/
src
/
xbt
/
dict_private.h
diff --git
a/src/xbt/dict_private.h
b/src/xbt/dict_private.h
index
033500f
..
a641b51
100644
(file)
--- a/
src/xbt/dict_private.h
+++ b/
src/xbt/dict_private.h
@@
-1,7
+1,7
@@
/* dict_elm - elements of generic dictionnaries */
/* This file is not to be loaded from anywhere but dict.c */
/* dict_elm - elements of generic dictionnaries */
/* This file is not to be loaded from anywhere but dict.c */
-/* Copyright (c) 2004
, 2005, 2006, 2007, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2004
-2011
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-22,7
+22,6
@@
typedef struct s_xbt_dictelm *xbt_dictelm_t;
#define MAX_FILL_PERCENT 80
typedef struct s_xbt_dictelm {
#define MAX_FILL_PERCENT 80
typedef struct s_xbt_dictelm {
- int dictielem:1;
char *key;
int key_len;
unsigned int hash_code;
char *key;
int key_len;
unsigned int hash_code;
@@
-34,10
+33,12
@@
typedef struct s_xbt_dictelm {
} s_xbt_dictelm_t;
typedef struct s_xbt_dict {
} s_xbt_dictelm_t;
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;
@@
-48,11
+49,9
@@
extern void *dict_elm_mallocator_new_f(void);
#define dict_elm_mallocator_reset_f ((void_f_pvoid_t)NULL)
/*####[ Function prototypes ]################################################*/
#define dict_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);
unsigned int hash_code, void *content,
void_f_pvoid_t free_f);
-xbt_dictelm_t xbt_dictielm_new(uintptr_t key, unsigned int hash_code,
- uintptr_t content);
-void xbt_dictelm_free(xbt_dictelm_t element);
+void xbt_dictelm_free(xbt_dict_t dict, xbt_dictelm_t element);
#endif /* _XBT_DICT_PRIVATE_H_ */
#endif /* _XBT_DICT_PRIVATE_H_ */