X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..dbe545bf15f8d0e923bcc60441d7c6d7393a1208:/src/xbt/dict_cursor.c

diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c
index 1808ab8ba0..44f9f56492 100644
--- a/src/xbt/dict_cursor.c
+++ b/src/xbt/dict_cursor.c
@@ -1,8 +1,7 @@
-/* $Id$ */
-
 /* dict_cursor - iterators over dictionnaries                               */
 
-/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * 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. */
@@ -34,7 +33,7 @@ struct xbt_dict_cursor_ {
 /** @brief Creator
  *  @param dict the dict
  */
-xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict)
+XBT_INLINE xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict)
 {
   xbt_dict_cursor_t res = NULL;
 
@@ -50,7 +49,7 @@ xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict)
  * @brief Destructor
  * @param cursor poor victim
  */
-void xbt_dict_cursor_free(xbt_dict_cursor_t * cursor)
+XBT_INLINE void xbt_dict_cursor_free(xbt_dict_cursor_t * cursor)
 {
   if (*cursor) {
     xbt_free(*cursor);
@@ -63,14 +62,14 @@ void xbt_dict_cursor_free(xbt_dict_cursor_t * cursor)
  */
 static XBT_INLINE void __cursor_not_null(xbt_dict_cursor_t cursor)
 {
-  xbt_assert0(cursor, "Null cursor");
+  xbt_assert(cursor, "Null cursor");
 }
 
 
 /** @brief Reinitialize the cursor. Mandatory after removal or add in dict. */
-void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor)
+XBT_INLINE void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor)
 {
-  CDEBUG0(xbt_dict_cursor, "xbt_dict_cursor_rewind");
+  XBT_CDEBUG(xbt_dict_cursor, "xbt_dict_cursor_rewind");
   xbt_assert(cursor);
 
   cursor->line = 0;
@@ -87,11 +86,12 @@ void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor)
  * @param      dict   on what to let the cursor iterate
  * @param[out] cursor dest address
  */
-void xbt_dict_cursor_first(const xbt_dict_t dict, xbt_dict_cursor_t * cursor)
+XBT_INLINE void xbt_dict_cursor_first(const xbt_dict_t dict,
+                                      xbt_dict_cursor_t * cursor)
 {
-  DEBUG0("xbt_dict_cursor_first");
+  XBT_DEBUG("xbt_dict_cursor_first");
   if (!*cursor) {
-    DEBUG0("Create the cursor on first use");
+    XBT_DEBUG("Create the cursor on first use");
     *cursor = xbt_dict_cursor_new(dict);
   } else {
     xbt_dict_cursor_rewind(*cursor);
@@ -105,14 +105,12 @@ void xbt_dict_cursor_first(const xbt_dict_t dict, xbt_dict_cursor_t * cursor)
 /**
  * \brief Move to the next element.
  */
-void xbt_dict_cursor_step(xbt_dict_cursor_t cursor)
+XBT_INLINE void xbt_dict_cursor_step(xbt_dict_cursor_t cursor)
 {
-
-
   xbt_dictelm_t current;
   int line;
 
-  DEBUG0("xbt_dict_cursor_step");
+  XBT_DEBUG("xbt_dict_cursor_step");
   xbt_assert(cursor);
 
   current = cursor->current;
@@ -121,17 +119,17 @@ void xbt_dict_cursor_step(xbt_dict_cursor_t cursor)
   if (cursor->dict != NULL) {
 
     if (current != NULL) {
-      DEBUG0("current is not null, take the next element");
+      XBT_DEBUG("current is not null, take the next element");
       current = current->next;
-      DEBUG1("next element: %p", current);
+      XBT_DEBUG("next element: %p", current);
     }
 
     while (current == NULL && ++line <= cursor->dict->table_size) {
-      DEBUG0("current is NULL, take the next line");
+      XBT_DEBUG("current is NULL, take the next line");
       current = cursor->dict->table[line];
-      DEBUG1("element in the next line: %p", current);
+      XBT_DEBUG("element in the next line: %p", current);
     }
-    DEBUG2("search finished, current = %p, line = %d", current, line);
+    XBT_DEBUG("search finished, current = %p, line = %d", current, line);
 
     cursor->current = current;
     cursor->line = line;
@@ -143,13 +141,13 @@ void xbt_dict_cursor_step(xbt_dict_cursor_t cursor)
  *
  * @returns true if it's ok, false if there is no more data
  */
-int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor,
-                                char **key, void **data)
+XBT_INLINE int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor,
+                                           char **key, void **data)
 {
 
   xbt_dictelm_t current;
 
-  DEBUG0("xbt_dict_get_or_free");
+  XBT_DEBUG("xbt_dict_get_or_free");
 
 
   if (!cursor || !(*cursor))
@@ -171,7 +169,7 @@ int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor,
  * @param cursor: the cursor
  * @returns the current key
  */
-char *xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor)
+XBT_INLINE char *xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor)
 {
   __cursor_not_null(cursor);
 
@@ -183,9 +181,28 @@ char *xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor)
  * @param cursor the cursor
  * @returns the current data
  */
-void *xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor)
+XBT_INLINE void *xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor)
 {
   __cursor_not_null(cursor);
 
   return cursor->current->content;
 }
+
+/**
+ * @brief Set current data
+ * @param cursor the cursor
+ * @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)
+{
+  __cursor_not_null(cursor);
+  if (cursor->current->free_f)
+    cursor->current->free_f(cursor->current->content);
+
+  cursor->current->content = data;
+  cursor->current->free_f = free_ctn;
+  return;
+}