#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) {
- xbt_dict_t dict=*(xbt_dict_t*)d;
- xbt_dict_free(&dict);
+static void _free_dict(void *d)
+{
+ 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.
* Dynars are not modified during the operation.
*/
-xbt_error_t
-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_error_t errcode;
- xbt_dict_t thislevel,nextlevel;
+void
+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_dict_t thislevel, nextlevel = NULL;
int i;
-
+
unsigned long int thislen;
char *thiskey;
- int keys_len=xbt_dynar_length(keys);
+ 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");
DEBUG2("xbt_multidict_set(%p,%d)", mdict, keys_len);
- for (i=0 , thislevel = mdict ;
- i<keys_len-1 ;
- i++ , thislevel = nextlevel) {
-
+ for (i = 0, thislevel = mdict; i < keys_len - 1; i++, thislevel = nextlevel) {
+
xbt_dynar_get_cpy(keys, i, &thiskey);
xbt_dynar_get_cpy(lens, i, &thislen);
-
- 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);
+ DEBUG5("multi_set: at level %d, len=%ld, key=%p |%*s|", i, thislen,
+ thiskey, (int) thislen, thiskey);
- /* make sure the dict of next level exists */
- if (errcode == mismatch_error) {
- nextlevel=xbt_dict_new();
- xbt_dict_set_ext(thislevel, thiskey, thislen, &nextlevel, _free_dict);
+ /* search the dict of next level */
+ nextlevel = xbt_dict_get_or_null_ext(thislevel, thiskey, thislen);
+ if (nextlevel == NULL) {
+ /* make sure the dict of next level exists */
+ nextlevel = xbt_dict_new();
+ VERB1("Create a dict (%p)", nextlevel);
+ xbt_dict_set_ext(thislevel, thiskey, thislen, nextlevel, &_free_dict);
}
}
xbt_dynar_get_cpy(keys, i, &thiskey);
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
* \arg data: what to store in the structure
* \arg free_ctn: function to use to free the pushed content on need
*/
-xbt_error_t
-xbt_multidict_set(xbt_dict_t mdict,
- xbt_dynar_t keys,
- void *data, void_f_pvoid_t *free_ctn) {
- xbt_error_t errcode;
- xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int),NULL);
- int i;
+void
+xbt_multidict_set(xbt_dict_t mdict,
+ xbt_dynar_t keys, void *data, void_f_pvoid_t free_ctn)
+{
+ 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*);
+ 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);
- xbt_dynar_push(lens,&thislen);
+ DEBUG2("Push %ld as level %lu length", thislen, i);
+ 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.
*
* Dynars are not modified during the operation.
*/
-xbt_error_t
-xbt_multidict_get_ext(xbt_dict_t mdict,
- xbt_dynar_t keys, xbt_dynar_t lens,
- /*OUT*/void **data) {
- xbt_error_t errcode;
- xbt_dict_t thislevel,nextlevel;
+void *xbt_multidict_get_ext(xbt_dict_t mdict,
+ xbt_dynar_t keys, xbt_dynar_t lens)
+{
+ xbt_dict_t thislevel, nextlevel;
int i;
unsigned long int thislen;
char *thiskey;
- int keys_len=xbt_dynar_length(keys);
+ int keys_len = xbt_dynar_length(keys);
xbt_assert(xbt_dynar_length(keys) == xbt_dynar_length(lens));
- xbt_assert0(xbt_dynar_length(keys) >= 1, "Can't get a zero-long key set in a multidict");
-
+ xbt_assert0(xbt_dynar_length(keys) >= 1,
+ "Can't get a zero-long key set in a multidict");
+
DEBUG2("xbt_multidict_get(%p, %ld)", mdict, xbt_dynar_length(keys));
- for (i=0 , thislevel=mdict ;
- i<keys_len-1 ;
- i++ , thislevel = nextlevel) {
-
+ for (i = 0, thislevel = mdict; i < keys_len - 1; i++, thislevel = nextlevel) {
+
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 */
- 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);
-
- 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;
- xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int),NULL);
- int i;
-
+void *xbt_multidict_get(xbt_dict_t mdict, xbt_dynar_t keys)
+{
+ xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int), NULL);
+ unsigned long i;
+ void *res;
+
for (i = 0; i < xbt_dynar_length(keys); i++) {
- char *thiskey = xbt_dynar_get_as(keys, i, char*);
+ char *thiskey = xbt_dynar_get_as(keys, i, char *);
unsigned long int thislen = (unsigned long int) strlen(thiskey);
- xbt_dynar_push(lens,&thislen);
+ xbt_dynar_push(lens, &thislen);
}
- errcode = xbt_multidict_get_ext(mdict, keys, lens, data),
- xbt_dynar_free(&lens);
- return errcode;
+ res = xbt_multidict_get_ext(mdict, keys, lens), xbt_dynar_free(&lens);
+ return res;
}
* Removing a non-existant key is ok.
*/
-xbt_error_t
-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;
+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;
-
- 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);
+ 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; i++, thislevel = nextlevel) {
- for (i=0 , thislevel=mdict ;
- i<keys_len-1 ;
- i++ , thislevel = nextlevel) {
-
xbt_dynar_get_cpy(keys, i, &thiskey);
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);
-
- return xbt_dict_remove_ext(thislevel, thiskey, thislen);
+
+ xbt_dict_remove_ext(thislevel, thiskey, thislen);
}
-xbt_error_t
-xbt_multidict_remove(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;
- xbt_error_t errcode;
- xbt_dynar_t lens = xbt_dynar_new(sizeof(unsigned long int),NULL);
- int i;
-
for (i = 0; i < xbt_dynar_length(keys); i++) {
- char *thiskey = xbt_dynar_get_as(keys, i, char*);
+ char *thiskey = xbt_dynar_get_as(keys, i, char *);
unsigned long int thislen = strlen(thiskey);
- xbt_dynar_push(lens,&thislen);
+ xbt_dynar_push(lens, &thislen);
+ }
+
+ TRY {
+ xbt_multidict_remove_ext(mdict, keys, lens);
+ } CLEANUP {
+ xbt_dynar_free(&lens);
+ } CATCH(e) {
+ RETHROW;
}
-
- errcode = xbt_multidict_remove_ext(mdict, keys, lens);
- xbt_dynar_free(&lens);
- return errcode;
}
