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
kill the sbrk-based morecore: we'll never use less than two heaps when using mmalloc
[simgrid.git]
/
src
/
xbt
/
dict_multi.c
diff --git
a/src/xbt/dict_multi.c
b/src/xbt/dict_multi.c
index
a11b2c9
..
0c2e692
100644
(file)
--- a/
src/xbt/dict_multi.c
+++ b/
src/xbt/dict_multi.c
@@
-85,7
+85,6
@@
xbt_multidict_set(xbt_dict_t mdict,
{
xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int), NULL);
unsigned long i;
- xbt_ex_t e;
for (i = 0; i < xbt_dynar_length(keys); i++) {
char *thiskey = xbt_dynar_get_as(keys, i, char *);
@@
-96,9
+95,11
@@
xbt_multidict_set(xbt_dict_t mdict,
TRY {
xbt_multidict_set_ext(mdict, keys, lens, data, free_ctn);
- } TRY_CLEANUP {
+ }
+ TRY_CLEANUP {
xbt_dynar_free(&lens);
- } CATCH(e) {
+ }
+ CATCH_ANONYMOUS {
RETHROW;
}
}
@@
-124,7
+125,7
@@
void *xbt_multidict_get_ext(xbt_dict_t mdict,
int keys_len = xbt_dynar_length(keys);
xbt_assert(xbt_dynar_length(keys) == xbt_dynar_length(lens));
- xbt_assert(
xbt_dynar_length(keys) >= 1
,
+ xbt_assert(
!xbt_dynar_is_empty(keys)
,
"Can't get a zero-long key set in a multidict");
XBT_DEBUG("xbt_multidict_get(%p, %ld)", mdict, xbt_dynar_length(keys));
@@
-182,8
+183,9
@@
void
xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys,
xbt_dynar_t lens)
{
- xbt_dict_t thislevel, nextlevel = NULL;
- int i;
+ volatile xbt_dict_t thislevel;
+ volatile xbt_dict_t nextlevel = NULL;
+ volatile int i;
xbt_ex_t e;
unsigned long int thislen;
@@
-221,8
+223,6
@@
xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys,
void xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys)
{
-
- xbt_ex_t e;
xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int), NULL);
unsigned long i;
@@
-234,9
+234,11
@@
void xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys)
TRY {
xbt_multidict_remove_ext(mdict, keys, lens);
- } TRY_CLEANUP {
+ }
+ TRY_CLEANUP {
xbt_dynar_free(&lens);
- } CATCH(e) {
+ }
+ CATCH_ANONYMOUS {
RETHROW;
}
}