2 files changed, 55 insertions, 2 deletions

diff --git a/libglusterfs/src/rbthash.c b/libglusterfs/src/rbthash.c
index 2f41d9825b4..64fe70a8edd 100644
--- a/libglusterfs/src/rbthash.c
+++ b/libglusterfs/src/rbthash.c
@@ -141,6 +141,7 @@ rbthash_table_init (int buckets, rbt_hasher_t hfunc,
         }
 
         LOCK_INIT (&newtab->tablelock);
+        INIT_LIST_HEAD (&newtab->list);
         newtab->numbuckets = buckets;
         ret = __rbthash_init_buckets (newtab, buckets);
 
@@ -191,6 +192,7 @@ rbthash_init_entry (rbthash_table_t *tbl, void *data, void *key, int keylen)
                 goto free_entry;
         }
 
+        INIT_LIST_HEAD (&entry->list);
         memcpy (entry->key, key, keylen);
         entry->keylen = keylen;
         entry->keyhash = tbl->hashfunc (entry->key, entry->keylen);
@@ -221,6 +223,13 @@ rbthash_deinit_entry (rbthash_table_t *tbl, rbthash_entry_t *entry)
         if (tbl) {
                 if ((entry->data) && (tbl->dfunc))
                         tbl->dfunc (entry->data);
+
+                LOCK (&tbl->tablelock);
+                {
+                        list_del_init (&entry->list);
+                }
+                UNLOCK (&tbl->tablelock);
+
                 mem_put (tbl->entrypool, entry);
         }
 
@@ -292,6 +301,12 @@ rbthash_insert (rbthash_table_t *tbl, void *data, void *key, int keylen)
                 rbthash_deinit_entry (tbl, entry);
         }
 
+        LOCK (&tbl->tablelock);
+        {
+                list_add_tail (&entry->list, &tbl->list);
+        }
+        UNLOCK (&tbl->tablelock);
+
 err:
         return ret;
 }
@@ -376,6 +391,13 @@ rbthash_remove (rbthash_table_t *tbl, void *key, int keylen)
 
         GF_FREE (entry->key);
         dataref = entry->data;
+
+        LOCK (&tbl->tablelock);
+        {
+                list_del_init (&entry->list);
+        }
+        UNLOCK (&tbl->tablelock);
+
         mem_put (tbl->entrypool, entry);
 
         return dataref;
@@ -421,3 +443,26 @@ rbthash_table_destroy (rbthash_table_t *tbl)
         GF_FREE (tbl->buckets);
         GF_FREE (tbl);
 }
+
+
+void
+rbthash_table_traverse (rbthash_table_t *tbl, rbt_traverse_t traverse,
+                        void *mydata)
+{
+        rbthash_entry_t *entry = NULL;
+
+        if ((tbl == NULL) || (traverse == NULL)) {
+                goto out;
+        }
+
+        LOCK (&tbl->tablelock);
+        {
+                list_for_each_entry (entry, &tbl->list, list) {
+                        traverse (entry->data, mydata);
+                }
+        }
+        UNLOCK (&tbl->tablelock);
+
+out:
+        return;
+}
diff --git a/libglusterfs/src/rbthash.h b/libglusterfs/src/rbthash.h
index 73b5b8e3012..96d7a9a5166 100644
--- a/libglusterfs/src/rbthash.h
+++ b/libglusterfs/src/rbthash.h
@@ -24,6 +24,7 @@
 #include "mem-pool.h"
 #include "logging.h"
 #include "common-utils.h"
+#include "list.h"
 
 #include <pthread.h>
 
@@ -38,12 +39,14 @@ struct rbthash_bucket {
 typedef struct rbthash_entry {
         void            *data;
         void            *key;
-        int             keylen;
-        uint32_t        keyhash;
+        int              keylen;
+        uint32_t         keyhash;
+        struct list_head list;
 } rbthash_entry_t;
 
 typedef uint32_t (*rbt_hasher_t) (void *data, int len);
 typedef void (*rbt_data_destroyer_t) (void *data);
+typedef void (*rbt_traverse_t) (void *data, void *mydata);
 
 typedef struct rbthash_table {
         int                     size;
@@ -54,6 +57,7 @@ typedef struct rbthash_table {
         rbt_hasher_t            hashfunc;
         rbt_data_destroyer_t    dfunc;
         gf_boolean_t            pool_alloced;
+        struct list_head        list;
 } rbthash_table_t;
 
 extern rbthash_table_t *
@@ -75,4 +79,8 @@ rbthash_replace (rbthash_table_t *tbl, void *key, int keylen, void *newdata);
 
 extern void
 rbthash_table_destroy (rbthash_table_t *tbl);
+
+extern void
+rbthash_table_traverse (rbthash_table_t *tbl, rbt_traverse_t traverse,
+                        void *mydata);
 #endif