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
printf format fixups
[simgrid.git]
/
src
/
xbt
/
dict_multi.c
diff --git
a/src/xbt/dict_multi.c
b/src/xbt/dict_multi.c
index
ddcb5ba
..
dc3d196
100644
(file)
--- a/
src/xbt/dict_multi.c
+++ b/
src/xbt/dict_multi.c
@@
-9,11
+9,11
@@
#include "dict_private.h"
#include "dict_private.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(
dict_multi,
dict, "Dictionaries of multiple keys");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(
xbt_dict_multi,xbt_
dict, "Dictionaries of multiple keys");
static void _free_dict(void*d) {
static void _free_dict(void*d) {
-
xbt_dict_t dict=*(xbt_dict_t*)d
;
- xbt_dict_free(
&dict
);
+
VERB1("free dict %p",d)
;
+ xbt_dict_free(
(xbt_dict_t*)&d
);
}
/** \brief Insert \e data under all the keys contained in \e keys, providing their sizes in \e lens.
}
/** \brief Insert \e data under all the keys contained in \e keys, providing their sizes in \e lens.
@@
-27,13
+27,13
@@
static void _free_dict(void*d) {
* Dynars are not modified during the operation.
*/
* Dynars are not modified during the operation.
*/
-xbt_error_t
+void
xbt_multidict_set_ext(xbt_dict_t mdict,
xbt_dynar_t keys, xbt_dynar_t lens,
xbt_multidict_set_ext(xbt_dict_t mdict,
xbt_dynar_t keys, xbt_dynar_t lens,
- void *data, void_f_pvoid_t
*
free_ctn) {
-
- xbt_e
rror_t errcod
e;
- xbt_dict_t thislevel,nextlevel;
+ void *data, void_f_pvoid_t
free_ctn) {
+
+ xbt_e
x_t
e;
+ xbt_dict_t thislevel,nextlevel
=NULL
;
int i;
unsigned long int thislen;
int i;
unsigned long int thislen;
@@
-55,12
+55,17
@@
xbt_multidict_set_ext(xbt_dict_t mdict,
DEBUG5("multi_set: at level %d, len=%ld, key=%p |%*s|", i, thislen, thiskey, (int)thislen,thiskey);
/* search the dict of next level */
DEBUG5("multi_set: at level %d, len=%ld, key=%p |%*s|", i, thislen, thiskey, (int)thislen,thiskey);
/* search the dict of next level */
- TRYCATCH(xbt_dict_get_ext(thislevel, thiskey, thislen, (void*)&nextlevel), mismatch_error);
-
- /* make sure the dict of next level exists */
- if (errcode == mismatch_error) {
+ TRY {
+ nextlevel = xbt_dict_get_ext(thislevel, thiskey, thislen);
+ } CATCH(e) {
+ if (e.category != not_found_error)
+ RETHROW;
+
+ /* make sure the dict of next level exists */
+ xbt_ex_free(e);
nextlevel=xbt_dict_new();
nextlevel=xbt_dict_new();
- xbt_dict_set_ext(thislevel, thiskey, thislen, &nextlevel, _free_dict);
+ VERB1("Create a dict (%p)",nextlevel);
+ xbt_dict_set_ext(thislevel, thiskey, thislen, nextlevel, &_free_dict);
}
}
}
}
@@
-68,8
+73,6
@@
xbt_multidict_set_ext(xbt_dict_t mdict,
xbt_dynar_get_cpy(lens, i, &thislen);
xbt_dict_set_ext(thislevel, thiskey, thislen, data, free_ctn);
xbt_dynar_get_cpy(lens, i, &thislen);
xbt_dict_set_ext(thislevel, thiskey, thislen, data, free_ctn);
-
- return no_error;
}
/** \brief Insert \e data under all the keys contained in \e keys
}
/** \brief Insert \e data under all the keys contained in \e keys
@@
-79,24
+82,28
@@
xbt_multidict_set_ext(xbt_dict_t mdict,
* \arg data: what to store in the structure
* \arg free_ctn: function to use to free the pushed content on need
*/
* \arg data: what to store in the structure
* \arg free_ctn: function to use to free the pushed content on need
*/
-xbt_error_t
+void
xbt_multidict_set(xbt_dict_t mdict,
xbt_dynar_t keys,
xbt_multidict_set(xbt_dict_t mdict,
xbt_dynar_t keys,
- void *data, void_f_pvoid_t *free_ctn) {
- xbt_error_t errcode;
+ void *data, void_f_pvoid_t free_ctn) {
xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int),NULL);
xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int),NULL);
- int i;
+ 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*);
unsigned long int thislen = (unsigned long int) strlen(thiskey);
for (i = 0; i < xbt_dynar_length(keys); i++) {
char *thiskey = xbt_dynar_get_as(keys, i, char*);
unsigned long int thislen = (unsigned long int) strlen(thiskey);
- DEBUG2("Push %ld as level %
d
length",thislen, i);
+ DEBUG2("Push %ld as level %
lu
length",thislen, i);
xbt_dynar_push(lens,&thislen);
}
xbt_dynar_push(lens,&thislen);
}
- errcode = xbt_multidict_set_ext(mdict, keys, lens, data, free_ctn);
- xbt_dynar_free(&lens);
- return errcode;
+ TRY {
+ xbt_multidict_set_ext(mdict, keys, lens, data, free_ctn);
+ } CLEANUP {
+ xbt_dynar_free(&lens);
+ } CATCH(e) {
+ RETHROW;
+ }
}
/** \brief Insert \e data under all the keys contained in \e keys, providing their sizes in \e lens.
}
/** \brief Insert \e data under all the keys contained in \e keys, providing their sizes in \e lens.
@@
-109,11
+116,9
@@
xbt_multidict_set(xbt_dict_t mdict,
*
* Dynars are not modified during the operation.
*/
*
* Dynars are not modified during the operation.
*/
-xbt_error_t
+void *
xbt_multidict_get_ext(xbt_dict_t mdict,
xbt_multidict_get_ext(xbt_dict_t mdict,
- xbt_dynar_t keys, xbt_dynar_t lens,
- /*OUT*/void **data) {
- xbt_error_t errcode;
+ xbt_dynar_t keys, xbt_dynar_t lens) {
xbt_dict_t thislevel,nextlevel;
int i;
xbt_dict_t thislevel,nextlevel;
int i;
@@
-133,23
+138,24
@@
xbt_multidict_get_ext(xbt_dict_t mdict,
xbt_dynar_get_cpy(keys, i, &thiskey);
xbt_dynar_get_cpy(lens, i, &thislen);
xbt_dynar_get_cpy(keys, i, &thiskey);
xbt_dynar_get_cpy(lens, i, &thislen);
- DEBUG5("multi_get: at level %d, len=%ld, key=%p |%*s|", i, thislen, thiskey, (int)thislen,thiskey);
+ DEBUG6("multi_get: at level %d (%p), len=%ld, key=%p |%*s|",
+ i, thislevel, thislen, thiskey, (int)thislen,thiskey);
/* search the dict of next level: let mismatch raise if not found */
/* search the dict of next level: let mismatch raise if not found */
-
TRY(xbt_dict_get_ext(thislevel, thiskey, thislen, (void*)&nextlevel)
);
+
nextlevel = xbt_dict_get_ext(thislevel, thiskey, thislen
);
}
xbt_dynar_get_cpy(keys, i, &thiskey);
xbt_dynar_get_cpy(lens, i, &thislen);
}
xbt_dynar_get_cpy(keys, i, &thiskey);
xbt_dynar_get_cpy(lens, i, &thislen);
- return xbt_dict_get_ext(thislevel, thiskey, thislen
, data
);
+ return xbt_dict_get_ext(thislevel, thiskey, thislen);
}
}
-xbt_error_t
-xbt_multidict_get(xbt_dict_t mdict, xbt_dynar_t keys, /*OUT*/void **data) {
- xbt_error_t errcode;
+void *
+xbt_multidict_get(xbt_dict_t mdict, xbt_dynar_t keys) {
xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int),NULL);
xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int),NULL);
- int i;
+ unsigned long i;
+ void *res;
for (i = 0; i < xbt_dynar_length(keys); i++) {
char *thiskey = xbt_dynar_get_as(keys, i, char*);
for (i = 0; i < xbt_dynar_length(keys); i++) {
char *thiskey = xbt_dynar_get_as(keys, i, char*);
@@
-157,9
+163,9
@@
xbt_multidict_get(xbt_dict_t mdict, xbt_dynar_t keys, /*OUT*/void **data) {
xbt_dynar_push(lens,&thislen);
}
xbt_dynar_push(lens,&thislen);
}
-
errcode = xbt_multidict_get_ext(mdict, keys, lens, data
),
+
res = xbt_multidict_get_ext(mdict, keys, lens
),
xbt_dynar_free(&lens);
xbt_dynar_free(&lens);
- return
errcode
;
+ return
res
;
}
}
@@
-176,21
+182,18
@@
xbt_multidict_get(xbt_dict_t mdict, xbt_dynar_t keys, /*OUT*/void **data) {
* Removing a non-existant key is ok.
*/
* Removing a non-existant key is ok.
*/
-xbt_error_t
+void
xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t lens) {
xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t lens) {
- xbt_error_t errcode;
- xbt_dict_t thislevel,nextlevel;
+ xbt_dict_t thislevel,nextlevel=NULL;
int i;
int i;
-
- xbt_assert(xbt_dynar_length(keys) == xbt_dynar_length(lens));
- xbt_assert0(xbt_dynar_length(keys), "Can't remove a zero-long key set in a multidict");
+ xbt_ex_t e;
unsigned long int thislen;
char *thiskey;
int keys_len=xbt_dynar_length(keys);
xbt_assert(xbt_dynar_length(keys) == xbt_dynar_length(lens));
unsigned long int thislen;
char *thiskey;
int keys_len=xbt_dynar_length(keys);
xbt_assert(xbt_dynar_length(keys) == xbt_dynar_length(lens));
- xbt_assert0(
keys_len, "Can't set
a zero-long key set in a multidict");
+ xbt_assert0(
xbt_dynar_length(keys), "Can't remove
a zero-long key set in a multidict");
for (i=0 , thislevel=mdict ;
i<keys_len-1 ;
for (i=0 , thislevel=mdict ;
i<keys_len-1 ;
@@
-200,33
+203,41
@@
xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t lens) {
xbt_dynar_get_cpy(lens, i, &thislen);
/* search the dict of next level */
xbt_dynar_get_cpy(lens, i, &thislen);
/* search the dict of next level */
- TRYCATCH(xbt_dict_get_ext(thislevel, thiskey, thislen, (void*)&nextlevel), mismatch_error);
-
- /* If non-existant entry, nothing to do */
- if (errcode == mismatch_error)
- return no_error;
+ TRY {
+ nextlevel = xbt_dict_get_ext(thislevel, thiskey, thislen);
+ } CATCH(e) {
+ /* If non-existant entry, nothing to do */
+ if (e.category == arg_error)
+ xbt_ex_free(e);
+ else
+ RETHROW;
+ }
}
xbt_dynar_get_cpy(keys, i, &thiskey);
xbt_dynar_get_cpy(lens, i, &thislen);
}
xbt_dynar_get_cpy(keys, i, &thiskey);
xbt_dynar_get_cpy(lens, i, &thislen);
-
return
xbt_dict_remove_ext(thislevel, thiskey, thislen);
+ xbt_dict_remove_ext(thislevel, thiskey, thislen);
}
}
-xbt_error_t
+void
xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys) {
xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys) {
- xbt_e
rror_t errcod
e;
+ xbt_e
x_t
e;
xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int),NULL);
xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int),NULL);
-
int
i;
+
unsigned long
i;
for (i = 0; i < xbt_dynar_length(keys); i++) {
char *thiskey = xbt_dynar_get_as(keys, i, char*);
unsigned long int thislen = strlen(thiskey);
xbt_dynar_push(lens,&thislen);
}
for (i = 0; i < xbt_dynar_length(keys); i++) {
char *thiskey = xbt_dynar_get_as(keys, i, char*);
unsigned long int thislen = strlen(thiskey);
xbt_dynar_push(lens,&thislen);
}
-
- errcode = xbt_multidict_remove_ext(mdict, keys, lens);
- xbt_dynar_free(&lens);
- return errcode;
+
+ TRY {
+ xbt_multidict_remove_ext(mdict, keys, lens);
+ } CLEANUP {
+ xbt_dynar_free(&lens);
+ } CATCH(e) {
+ RETHROW;
+ }
}
}