Changeset 14c9aa6 in mainline for kernel/generic/include/adt/cht.h

Timestamp:

2012-07-27T13:40:19Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0949b7a

Parents:

4ec9ea41

Message:

cht: Added initial working concurrent hash table. Builds and runs.

File:

• kernel/generic/include/adt/cht.h (modified) (4 diffs)

kernel/generic/include/adt/cht.h

@@ -40 +40 @@
 #include <synch/rcu.h>
 #include <macros.h>
+#include <synch/workqueue.h>
 
 typedef uintptr_t cht_ptr_t;
@@ -53 +54 @@
 /** Set of operations for a concurrent hash table. */
 typedef struct cht_ops {
-        size_t (*hash)(cht_link_t *node);
+        size_t (*hash)(const cht_link_t *item);
         size_t (*key_hash)(void *key);
         bool (*equal)(const cht_link_t *item1, const cht_link_t *item2);
@@ -70 +71 @@
         cht_ops_t *op;
         
+        size_t min_order;
         cht_buckets_t *b;
         cht_buckets_t *new_b;
+
+        work_t resize_work;
+        atomic_t resize_reqs;
         
-        atomic_t resize_reqs;
         atomic_t item_cnt;
 } cht_t;
@@ -84 +88 @@
 #define cht_read_unlock()   rcu_read_unlock()
 
-extern void cht_create(cht_t *h, size_t init_size, cht_ops_t *op);
+extern bool cht_create(cht_t *h, size_t init_size, size_t min_size, cht_ops_t *op);
 extern void cht_destroy(cht_t *h);
 
 extern cht_link_t *cht_find(cht_t *h, void *key);
 extern cht_link_t *cht_find_lazy(cht_t *h, void *key);
+extern cht_link_t *cht_find_next(cht_t *h, const cht_link_t *item);
+extern cht_link_t *cht_find_next_lazy(cht_t *h, const cht_link_t *item);
+
 extern void cht_insert(cht_t *h, cht_link_t *item);
 extern bool cht_insert_unique(cht_t *h, cht_link_t *item);