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

diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c
index 65411180a7..d7d354369e 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. */
@@ -11,10 +10,11 @@
 #include "xbt/ex.h"
 #include "dict_private.h"
 
-#include <string.h> /* strlen() */
+#include <string.h>             /* strlen() */
 
 XBT_LOG_EXTERNAL_CATEGORY(xbt_dict);
-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 ]#############################################*/
@@ -30,10 +30,11 @@ struct xbt_dict_cursor_ {
 #undef xbt_dict_CURSOR_DEBUG
 /*#define xbt_dict_CURSOR_DEBUG 1*/
 
-/** @brief Creator 
+/** @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;
 
   res = xbt_new(s_xbt_dict_cursor_t, 1);
@@ -48,7 +49,8 @@ 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);
     *cursor = NULL;
@@ -58,21 +60,22 @@ void xbt_dict_cursor_free(xbt_dict_cursor_t *cursor) {
 /*
  * Sanity check to see if the head contains something
  */
-static _XBT_INLINE void __cursor_not_null(xbt_dict_cursor_t cursor) {
+static XBT_INLINE void __cursor_not_null(xbt_dict_cursor_t cursor)
+{
   xbt_assert0(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_assert(cursor);
 
   cursor->line = 0;
   if (cursor->dict != NULL) {
     cursor->current = cursor->dict->table[0];
-  }
-  else {
+  } else {
     cursor->current = NULL;
   }
 }
@@ -83,29 +86,28 @@ 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");
   if (!*cursor) {
     DEBUG0("Create the cursor on first use");
     *cursor = xbt_dict_cursor_new(dict);
-  }
-  else {
+  } else {
     xbt_dict_cursor_rewind(*cursor);
   }
   if (dict != NULL && (*cursor)->current == NULL) {
-    xbt_dict_cursor_step(*cursor); /* find the first element */
+    xbt_dict_cursor_step(*cursor);      /* find the first element */
   }
 }
 
 
 /**
- * \brief Move to the next element. 
+ * \brief Move to the next element.
  */
-void xbt_dict_cursor_step(xbt_dict_cursor_t cursor) {
-
-
-  xbt_dictelm_t current ;
+XBT_INLINE void xbt_dict_cursor_step(xbt_dict_cursor_t cursor)
+{
+  xbt_dictelm_t current;
   int line;
 
   DEBUG0("xbt_dict_cursor_step");
@@ -121,14 +123,14 @@ void xbt_dict_cursor_step(xbt_dict_cursor_t cursor) {
       current = current->next;
       DEBUG1("next element: %p", current);
     }
-    
-    while (current == NULL && ++line < cursor->dict->table_size) {
+
+    while (current == NULL && ++line <= cursor->dict->table_size) {
       DEBUG0("current is NULL, take the next line");
       current = cursor->dict->table[line];
       DEBUG1("element in the next line: %p", current);
     }
     DEBUG2("search finished, current = %p, line = %d", current, line);
-    
+
     cursor->current = current;
     cursor->line = line;
   }
@@ -139,9 +141,9 @@ 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;
 
@@ -152,11 +154,11 @@ int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t  *cursor,
     return FALSE;
 
   current = (*cursor)->current;
-  if (current == NULL) { /* no data left */
+  if (current == NULL) {        /* no data left */
     xbt_dict_cursor_free(cursor);
     return FALSE;
   }
-  
+
   *key = current->key;
   *data = current->content;
   return TRUE;
@@ -167,7 +169,8 @@ 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);
 
   return cursor->current->key;
@@ -178,10 +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;
+}