X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/421e2f7dd584b6aa936de631a730fb3b21ca7565..ef4f048178e3b6cec78b1ca6be62e732e30ac87d:/src/xbt/dict_cursor.c diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c index 3b600aa485..1e3393556b 100644 --- a/src/xbt/dict_cursor.c +++ b/src/xbt/dict_cursor.c @@ -2,93 +2,81 @@ /* dict_cursor - iterators over dictionnaries */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 Martin Quinson. */ +/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/misc.h" #include "dict_private.h" #include /* strlen() */ -GRAS_LOG_EXTERNAL_CATEGORY(dict); -GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(dict_cursor,dict,"To traverse dictionaries"); +XBT_LOG_EXTERNAL_CATEGORY(dict); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(dict_cursor,dict,"To traverse dictionaries"); /*####[ Dict cursor functions ]#############################################*/ /* To traverse (simple) dicts */ /* Don't add or remove entries to the dict while traversing !!! */ /*###########################################################################*/ -struct gras_dict_cursor_ { +struct xbt_dict_cursor_ { /* we store all level encountered until here, to backtrack on next() */ - gras_dynar_t keys; - gras_dynar_t key_lens; + xbt_dynar_t keys; + xbt_dynar_t key_lens; int pos; int pos_len; - gras_dictelm_t head; + xbt_dictelm_t head; }; -static _GRAS_INLINE void -_cursor_push_keys(gras_dict_cursor_t p_cursor, - gras_dictelm_t p_elm); +static _XBT_INLINE void +_cursor_push_keys(xbt_dict_cursor_t p_cursor, + xbt_dictelm_t p_elm); -#undef gras_dict_CURSOR_DEBUG -/*#define gras_dict_CURSOR_DEBUG 1*/ +#undef xbt_dict_CURSOR_DEBUG +/*#define xbt_dict_CURSOR_DEBUG 1*/ -/** - * gras_dict_cursor_new: - * - * @head: the head of the dict - * @cursor: the curent position in the dict - * - * Structure creator +/** @brief Creator + * @param head the dict */ -gras_dict_cursor_t -gras_dict_cursor_new(const gras_dict_t head) { - gras_error_t errcode = no_error; - gras_dict_cursor_t res = NULL; - - res = gras_new(s_gras_dict_cursor_t,1); - res->keys = gras_dynar_new(sizeof(char **), NULL); - res->key_lens = gras_dynar_new(sizeof(int *), NULL); +xbt_dict_cursor_t +xbt_dict_cursor_new(const xbt_dict_t head) { + xbt_dict_cursor_t res = NULL; + + res = xbt_new(s_xbt_dict_cursor_t,1); + res->keys = xbt_dynar_new(sizeof(char **), NULL); + res->key_lens = xbt_dynar_new(sizeof(int *), NULL); res->pos = 0; res->pos_len = 0; res->head = head ? head->head : NULL; - gras_dict_cursor_rewind(res); + xbt_dict_cursor_rewind(res); return res; } /** - * gras_dict_cursor_free: - * - * @cursor: poor victim - * - * Structure destructor + * @brief Destructor + * @param cursor poor victim */ void -gras_dict_cursor_free(gras_dict_cursor_t *cursor) { +xbt_dict_cursor_free(xbt_dict_cursor_t *cursor) { if (*cursor) { - gras_dynar_free(&((*cursor)->keys)); - gras_dynar_free(&((*cursor)->key_lens)); - gras_free(*cursor); + xbt_dynar_free(&((*cursor)->keys)); + xbt_dynar_free(&((*cursor)->key_lens)); + free(*cursor); *cursor = NULL; } } -/** - * __cursor_not_null: - * +/* * Sanity check to see if the head contains something */ -static _GRAS_INLINE -gras_error_t -__cursor_not_null(gras_dict_cursor_t cursor) { +static _XBT_INLINE +xbt_error_t +__cursor_not_null(xbt_dict_cursor_t cursor) { - gras_assert0(cursor, "Null cursor"); + xbt_assert0(cursor, "Null cursor"); if (!cursor->head) { return mismatch_error; @@ -98,24 +86,23 @@ __cursor_not_null(gras_dict_cursor_t cursor) { } -static _GRAS_INLINE +static _XBT_INLINE void -_cursor_push_keys(gras_dict_cursor_t cursor, - gras_dictelm_t elm) { - gras_error_t errcode = no_error; - gras_dictelm_t child = NULL; +_cursor_push_keys(xbt_dict_cursor_t cursor, + xbt_dictelm_t elm) { + xbt_dictelm_t child = NULL; int i = 0; static volatile int count = 0; /* ??? */ - CDEBUG1(dict_cursor, "Push childs of %p in the cursor", (void*)elm); + CDEBUG3(dict_cursor, "Push childs of %p (%.*s) in the cursor", (void*)elm, elm->key_len, elm->key); - if (elm->content) { - gras_dynar_push(cursor->keys, &elm->key ); - gras_dynar_push(cursor->key_lens, &elm->key_len); + if (!elm->internal) { + xbt_dynar_push(cursor->keys, &elm->key ); + xbt_dynar_push(cursor->key_lens, &elm->key_len); count++; } - gras_dynar_foreach(elm->sub, i, child) { + xbt_dynar_foreach(elm->sub, i, child) { if (child) _cursor_push_keys(cursor, child); } @@ -123,143 +110,129 @@ _cursor_push_keys(gras_dict_cursor_t cursor, CDEBUG1(dict_cursor, "Count = %d", count); } -/** - * gras_dict_cursor_rewind: - * @cursor: the cursor - * @Returns: gras_error_t - * - * back to the first element - */ +/** @brief Reinitialize the cursor. Mandatory after removal or add in dict. */ void -gras_dict_cursor_rewind(gras_dict_cursor_t cursor) { - gras_error_t errcode = no_error; +xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor) { - CDEBUG0(dict_cursor, "gras_dict_cursor_rewind"); - gras_assert(cursor); + CDEBUG0(dict_cursor, "xbt_dict_cursor_rewind"); + xbt_assert(cursor); - gras_dynar_reset(cursor->keys); - gras_dynar_reset(cursor->key_lens); + xbt_dynar_reset(cursor->keys); + xbt_dynar_reset(cursor->key_lens); if (!cursor->head) return ; _cursor_push_keys(cursor, cursor->head); - gras_dynar_cursor_first(cursor->keys, &cursor->pos ); - gras_dynar_cursor_first(cursor->key_lens, &cursor->pos_len); + xbt_dynar_cursor_first(cursor->keys, &cursor->pos ); + xbt_dynar_cursor_first(cursor->key_lens, &cursor->pos_len); } /** - * gras_dict_cursor_first: - * @dict: on what to let the cursor iterate - * @cursor: dest address + * @brief Create the cursor if it does not exists. Rewind it in any case. * - * Create the cursor if it does not exists. Rewind it in any case. + * @param dict on what to let the cursor iterate + * @param[out] cursor dest address */ -void gras_dict_cursor_first (const gras_dict_t dict, - gras_dict_cursor_t *cursor){ +void xbt_dict_cursor_first (const xbt_dict_t dict, + xbt_dict_cursor_t *cursor){ if (!*cursor) { DEBUG0("Create the cursor on first use"); - *cursor=gras_dict_cursor_new(dict); + *cursor=xbt_dict_cursor_new(dict); } - gras_dict_cursor_rewind(*cursor); + xbt_dict_cursor_rewind(*cursor); } /** - * gras_dict_cursor_step: - * @cursor: the cursor - * - * Move to the next element. + * \brief Move to the next element. */ void -gras_dict_cursor_step(gras_dict_cursor_t cursor) { - gras_assert(cursor); - - gras_dynar_cursor_step(cursor->keys, &cursor->pos); - gras_dynar_cursor_step(cursor->key_lens, &cursor->pos_len); +xbt_dict_cursor_step(xbt_dict_cursor_t cursor) { + xbt_assert(cursor); + + DEBUG2("step cursor. Current=%.*s", + xbt_dynar_get_as(cursor->key_lens,cursor->pos_len,int), + xbt_dynar_get_as(cursor->keys,cursor->pos,char *)); + xbt_dynar_cursor_step(cursor->keys, &cursor->pos); + xbt_dynar_cursor_step(cursor->key_lens, &cursor->pos_len); } /** - * gras_dict_cursor_get_or_free: - * @cursor: the cursor - * @Returns: true if it's ok, false if there is no more data + * @brief Get current data, or free the cursor if there is no data left * - * Get current data + * @returns true if it's ok, false if there is no more data */ int -gras_dict_cursor_get_or_free(gras_dict_cursor_t *cursor, - char **key, - void **data) { - gras_error_t errcode = no_error; +xbt_dict_cursor_get_or_free(xbt_dict_cursor_t *cursor, + char **key, + void **data) { + xbt_error_t errcode = no_error; int key_len = 0; if (!cursor || !(*cursor)) return FALSE; - if (gras_dynar_length((*cursor)->keys) <= (*cursor)->pos) { - gras_dict_cursor_free(cursor); + if (xbt_dynar_length((*cursor)->keys) <= (*cursor)->pos) { + xbt_dict_cursor_free(cursor); return FALSE; } - *key = gras_dynar_get_as((*cursor)->keys, (*cursor)->pos, char*); - key_len = gras_dynar_get_as((*cursor)->key_lens, (*cursor)->pos_len, int); + *key = xbt_dynar_get_as((*cursor)->keys, (*cursor)->pos, char*); + key_len = xbt_dynar_get_as((*cursor)->key_lens, (*cursor)->pos_len, int); - errcode = gras_dictelm_get_ext((*cursor)->head, *key, key_len, data); + errcode = xbt_dictelm_get_ext((*cursor)->head, *key, key_len, data); if (errcode == mismatch_error) { - gras_dict_cursor_free(cursor); + xbt_dict_cursor_free(cursor); return FALSE; } - gras_assert1(errcode == no_error, + xbt_assert1(errcode == no_error, "Unexpected problem while retrieving the content of cursor. Got %s", - gras_error_name(errcode)); + xbt_error_name(errcode)); return TRUE; } /** - * gras_dict_cursor_get_key: - * @cursor: the cursor - * @key: the current element - * @Returns: gras_error_t - * - * Get current key + * @brief Get current key + * @param cursor: the cursor + * @param key where to put the key */ -gras_error_t -gras_dict_cursor_get_key(gras_dict_cursor_t cursor, +xbt_error_t +xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor, /*OUT*/char **key) { - gras_error_t errcode = no_error; + xbt_error_t errcode = no_error; TRY(__cursor_not_null(cursor)); - *key = gras_dynar_get_as(cursor->keys, cursor->pos - 1, char*); + *key = xbt_dynar_get_as(cursor->keys, cursor->pos - 1, char*); return errcode; } /** - * gras_dict_cursor_get_data: - * @cursor: the cursor - * - * Get current data + * @brief Get current data + * @param cursor the cursor + * @param data where to put the data */ -gras_error_t -gras_dict_cursor_get_data(gras_dict_cursor_t cursor, +xbt_error_t +xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor, /*OUT*/void **data) { - gras_error_t errcode = no_error; + xbt_error_t errcode = no_error; char *key = NULL; int key_len = 0; TRY(__cursor_not_null(cursor)); - key = gras_dynar_get_as(cursor->keys, cursor->pos-1, char *); - key_len = gras_dynar_get_as(cursor->key_lens, cursor->pos_len-1, int); + key = xbt_dynar_get_as(cursor->keys, cursor->pos-1, char *); + key_len = xbt_dynar_get_as(cursor->key_lens, cursor->pos_len-1, int); - TRY(gras_dictelm_get_ext(cursor->head, key, key_len, data)); + TRY(xbt_dictelm_get_ext(cursor->head, key, key_len, data)); return errcode; }