Add xbt_dict_get_key achieving a linear reverse search

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6486 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/ChangeLog b/ChangeLog
index f8feaa9..863403d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,7 @@ SimGrid (3.3.2-svn) unstable; urgency=low
   * Add xbt_set_get_by_name_or_null() [Silas De Munck]
   * Add xbt_graph_node_get_outedges() [Silas De Munck]
   * Add xbt_str_from_file(FILE*)
+  * Add xbt_dict_get_key achieving a linear reverse search
 
  -- Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 

diff --git a/include/xbt/dict.h b/include/xbt/dict.h
index 980cca0..ed34f41 100644 (file)
--- a/include/xbt/dict.h
+++ b/include/xbt/dict.h
@@ -61,6 +61,7 @@ XBT_PUBLIC(void) xbt_dict_set(xbt_dict_t dict, const char *key, void *data,
                               void_f_pvoid_t free_ctn);
 XBT_PUBLIC(void *) xbt_dict_get(xbt_dict_t dict, const char *key);
 XBT_PUBLIC(void *) xbt_dict_get_or_null(xbt_dict_t dict, const char *key);
+XBT_PUBLIC(char *) xbt_dict_get_key(xbt_dict_t dict, void*data);
 
 XBT_PUBLIC(void) xbt_dict_remove(xbt_dict_t dict, const char *key);
 XBT_PUBLIC(void) xbt_dict_reset(xbt_dict_t dict);

diff --git a/src/xbt/dict.c b/src/xbt/dict.c
index 967e0ec..93b29eb 100644 (file)
--- a/src/xbt/dict.c
+++ b/src/xbt/dict.c
@@ -357,6 +357,28 @@ void *xbt_dict_get_or_null_ext(xbt_dict_t dict, const char *key, int key_len)
   return current->content;
 }
 
+/**
+ * @brief retrieve the key associated to that object. Warning, that's a linear search
+ *
+ * Returns NULL if the object cannot be found
+ */
+char *xbt_dict_get_key(xbt_dict_t dict, void*data) {
+  int i;
+  xbt_dictelm_t current;
+
+
+  for (i = 0; i <= dict->table_size; i++) {
+    current = dict->table[i];
+    while (current != NULL) {
+      if (current->content == data)
+        return current->key;
+      current = current->next;
+    }
+  }
+
+  return NULL;
+}
+
 /**
  * \brief Retrieve data from the dict (null-terminated key)
  *
@@ -790,11 +812,37 @@ static void count(xbt_dict_t dict, int length)
                    "Announced length(%d) != %d.", xbt_dict_length(dict),
                    length);
 
+  xbt_dict_foreach(dict, cursor, key, data)
+    effective++;
+
+  xbt_test_assert2(effective == length, "Effective length(%d) != %d.",
+                   effective, length);
+
+}
+
+static void count_check_get_key(xbt_dict_t dict, int length)
+{
+  xbt_dict_cursor_t cursor;
+  char *key,*key2;
+  void *data;
+  int effective = 0;
+
+
+  xbt_test_add1("Count elements (expecting %d), and test the getkey function", length);
+  xbt_test_assert2(xbt_dict_length(dict) == length,
+                   "Announced length(%d) != %d.", xbt_dict_length(dict),
+                   length);
+
   xbt_dict_foreach(dict, cursor, key, data) {
     effective++;
+    key2 = xbt_dict_get_key(dict,data);
+    xbt_assert2(!strcmp(key,key2),
+          "The data was registered under %s instead of %s as expected",key2,key);
   }
+
   xbt_test_assert2(effective == length, "Effective length(%d) != %d.",
                    effective, length);
+
 }
 
 xbt_ex_t e;
@@ -802,8 +850,7 @@ xbt_dict_t head = NULL;
 char *data;
 
 
-XBT_TEST_UNIT("basic", test_dict_basic,
-              "Basic usage: change, retrieve, traverse")
+XBT_TEST_UNIT("basic", test_dict_basic,"Basic usage: change, retrieve, traverse")
 {
   xbt_test_add0("Traversal the null dictionary");
   traverse(head);
@@ -822,7 +869,7 @@ XBT_TEST_UNIT("basic", test_dict_basic,
 
   xbt_test_add0("Traverse the full dictionary");
   fill(&head);
-  count(head, 7);
+  count_check_get_key(head, 7);
 
   debuged_add_ext(head, "toto", "tutu");
   search_ext(head, "toto", "tutu");
@@ -837,22 +884,22 @@ XBT_TEST_UNIT("basic", test_dict_basic,
 
   /* CHANGING */
   fill(&head);
-  count(head, 7);
+  count_check_get_key(head, 7);
   xbt_test_add0("Change 123 to 'Changed 123'");
   xbt_dict_set(head, "123", strdup("Changed 123"), &free);
-  count(head, 7);
+  count_check_get_key(head, 7);
 
   xbt_test_add0("Change 123 back to '123'");
   xbt_dict_set(head, "123", strdup("123"), &free);
-  count(head, 7);
+  count_check_get_key(head, 7);
 
   xbt_test_add0("Change 12a to 'Dummy 12a'");
   xbt_dict_set(head, "12a", strdup("Dummy 12a"), &free);
-  count(head, 7);
+  count_check_get_key(head, 7);
 
   xbt_test_add0("Change 12a to '12a'");
   xbt_dict_set(head, "12a", strdup("12a"), &free);
-  count(head, 7);
+  count_check_get_key(head, 7);
 
   xbt_test_add0("Traverse the resulting dictionary");
   traverse(head);