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
Merge pull request #202 from Takishipp/clear_fct
[simgrid.git]
/
src
/
xbt
/
dict_cursor.c
diff --git
a/src/xbt/dict_cursor.c
b/src/xbt/dict_cursor.c
index
790536c
..
38c7930
100644
(file)
--- a/
src/xbt/dict_cursor.c
+++ b/
src/xbt/dict_cursor.c
@@
-1,6
+1,6
@@
-/* dict_cursor - iterators over diction
n
aries */
+/* dict_cursor - iterators over dictionaries */
-/* Copyright (c) 2004-201
3
. The SimGrid Team.
+/* Copyright (c) 2004-201
4
. 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
@@
-12,9
+12,7
@@
#include <string.h> /* strlen() */
#include <string.h> /* strlen() */
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_cursor, xbt_dict,
- "To traverse dictionaries");
-
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_cursor, xbt_dict, "To traverse dictionaries");
/*####[ Dict cursor functions ]#############################################*/
/* To traverse (simple) dicts */
/*####[ Dict cursor functions ]#############################################*/
/* To traverse (simple) dicts */
@@
-27,11
+25,9
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_cursor, xbt_dict,
/** @brief Creator
* @param dict the dict
*/
/** @brief Creator
* @param dict the dict
*/
-
XBT_INLINE
xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict)
+
inline
xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict)
{
{
- xbt_dict_cursor_t res = NULL;
-
- res = xbt_new(s_xbt_dict_cursor_t, 1);
+ xbt_dict_cursor_t res = xbt_new(s_xbt_dict_cursor_t, 1);
res->dict = dict;
xbt_dict_cursor_rewind(res);
res->dict = dict;
xbt_dict_cursor_rewind(res);
@@
-43,7
+39,7
@@
XBT_INLINE xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict)
* @brief Destructor
* @param cursor poor victim
*/
* @brief Destructor
* @param cursor poor victim
*/
-
XBT_INLINE
void xbt_dict_cursor_free(xbt_dict_cursor_t * cursor)
+
inline
void xbt_dict_cursor_free(xbt_dict_cursor_t * cursor)
{
xbt_free(*cursor);
*cursor = NULL;
{
xbt_free(*cursor);
*cursor = NULL;
@@
-52,14
+48,13
@@
XBT_INLINE void xbt_dict_cursor_free(xbt_dict_cursor_t * cursor)
/*
* Sanity check to see if the head contains something
*/
/*
* Sanity check to see if the head contains something
*/
-static
XBT_INLINE
void __cursor_not_null(xbt_dict_cursor_t cursor)
+static
inline
void __cursor_not_null(xbt_dict_cursor_t cursor)
{
xbt_assert(cursor, "Null cursor");
}
{
xbt_assert(cursor, "Null cursor");
}
-
/** @brief Reinitialize the cursor. Mandatory after removal or add in dict. */
/** @brief Reinitialize the cursor. Mandatory after removal or add in dict. */
-
XBT_INLINE
void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor)
+
inline
void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor)
{
XBT_CDEBUG(xbt_dict_cursor, "xbt_dict_cursor_rewind");
xbt_assert(cursor);
{
XBT_CDEBUG(xbt_dict_cursor, "xbt_dict_cursor_rewind");
xbt_assert(cursor);
@@
-78,12
+73,11
@@
XBT_INLINE void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor)
* @param dict on what to let the cursor iterate
* @param[out] cursor dest address
*/
* @param dict on what to let the cursor iterate
* @param[out] cursor dest address
*/
-XBT_INLINE void xbt_dict_cursor_first(const xbt_dict_t dict,
- xbt_dict_cursor_t * cursor)
+inline void xbt_dict_cursor_first(const xbt_dict_t dict, xbt_dict_cursor_t * cursor)
{
{
- XBT_
DEBUG(
"xbt_dict_cursor_first");
+ XBT_
CDEBUG(xbt_dict_cursor,
"xbt_dict_cursor_first");
if (!*cursor) {
if (!*cursor) {
- XBT_
DEBUG(
"Create the cursor on first use");
+ XBT_
CDEBUG(xbt_dict_cursor,
"Create the cursor on first use");
*cursor = xbt_dict_cursor_new(dict);
} else {
xbt_dict_cursor_rewind(*cursor);
*cursor = xbt_dict_cursor_new(dict);
} else {
xbt_dict_cursor_rewind(*cursor);
@@
-93,35
+87,32
@@
XBT_INLINE void xbt_dict_cursor_first(const xbt_dict_t dict,
}
}
}
}
-
-/**
- * \brief Move to the next element.
- */
-XBT_INLINE void xbt_dict_cursor_step(xbt_dict_cursor_t cursor)
+/** \brief Move to the next element. */
+inline void xbt_dict_cursor_step(xbt_dict_cursor_t cursor)
{
xbt_dictelm_t current;
int line;
{
xbt_dictelm_t current;
int line;
- XBT_
DEBUG(
"xbt_dict_cursor_step");
+ XBT_
CDEBUG(xbt_dict_cursor,
"xbt_dict_cursor_step");
xbt_assert(cursor);
current = cursor->current;
line = cursor->line;
if (cursor->dict != NULL) {
xbt_assert(cursor);
current = cursor->current;
line = cursor->line;
if (cursor->dict != NULL) {
-
if (current != NULL) {
if (current != NULL) {
- XBT_
DEBUG(
"current is not null, take the next element");
+ XBT_
CDEBUG(xbt_dict_cursor,
"current is not null, take the next element");
current = current->next;
current = current->next;
- XBT_
DEBUG(
"next element: %p", current);
+ XBT_
CDEBUG(xbt_dict_cursor,
"next element: %p", current);
}
}
- while (current == NULL && ++line <= cursor->dict->table_size) {
- XBT_DEBUG("current is NULL, take the next line");
+ while (current == NULL && (line + 1) <= cursor->dict->table_size) {
+ line++;
+ XBT_CDEBUG(xbt_dict_cursor, "current is NULL, take the next line");
current = cursor->dict->table[line];
current = cursor->dict->table[line];
- XBT_
DEBUG(
"element in the next line: %p", current);
+ XBT_
CDEBUG(xbt_dict_cursor,
"element in the next line: %p", current);
}
}
- XBT_
DEBUG(
"search finished, current = %p, line = %d", current, line);
+ XBT_
CDEBUG(xbt_dict_cursor,
"search finished, current = %p, line = %d", current, line);
cursor->current = current;
cursor->line = line;
cursor->current = current;
cursor->line = line;
@@
-133,14
+124,11
@@
XBT_INLINE void xbt_dict_cursor_step(xbt_dict_cursor_t cursor)
*
* @returns true if it's ok, false if there is no more data
*/
*
* @returns true if it's ok, false if there is no more data
*/
-XBT_INLINE int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor,
- char **key, void **data)
+inline int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor, char **key, void **data)
{
{
-
xbt_dictelm_t current;
xbt_dictelm_t current;
- XBT_DEBUG("xbt_dict_get_or_free");
-
+ XBT_CDEBUG(xbt_dict_cursor, "xbt_dict_get_or_free");
if (!cursor || !(*cursor))
return FALSE;
if (!cursor || !(*cursor))
return FALSE;
@@
-161,7
+149,7
@@
XBT_INLINE int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor,
* @param cursor: the cursor
* @returns the current key
*/
* @param cursor: the cursor
* @returns the current key
*/
-
XBT_INLINE
char *xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor)
+
inline
char *xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor)
{
__cursor_not_null(cursor);
{
__cursor_not_null(cursor);
@@
-173,7
+161,7
@@
XBT_INLINE char *xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor)
* @param cursor the cursor
* @returns the current data
*/
* @param cursor the cursor
* @returns the current data
*/
-
XBT_INLINE
void *xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor)
+
inline
void *xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor)
{
__cursor_not_null(cursor);
{
__cursor_not_null(cursor);
@@
-186,9
+174,7
@@
XBT_INLINE void *xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor)
* @param data the new data
* @param free_ctn the function to free the new data
*/
* @param data the new data
* @param free_ctn the function to free the new data
*/
-XBT_INLINE void xbt_dict_cursor_set_data(xbt_dict_cursor_t cursor,
- void *data,
- void_f_pvoid_t free_ctn)
+inline void xbt_dict_cursor_set_data(xbt_dict_cursor_t cursor, void *data, void_f_pvoid_t free_ctn)
{
__cursor_not_null(cursor);
xbt_dictelm_set_data(cursor->dict, cursor->current, data, free_ctn);
{
__cursor_not_null(cursor);
xbt_dictelm_set_data(cursor->dict, cursor->current, data, free_ctn);