#include <string.h>
#include "common.h"
-#include "mlocal.h"
+#include "list.h"
#include "mem.h"
-typedef struct node {
+typedef struct ll_iter node_t;
+
+struct ll_iter {
void *key;
uint64_t val;
- struct node *next;
-} node_t;
+ node_t *next;
+};
struct ll {
node_t *head;
- cmp_fun_t cmp_fun;
- clone_fun_t clone_fun;
-};
-
-static const map_impl_t ll_map_impl = {
- (map_alloc_t)ll_alloc, (map_cas_t)ll_cas, (map_get_t)ll_lookup, (map_remove_t)ll_remove,
- (map_count_t)ll_count, (map_print_t)ll_print, (map_free_t)ll_free
+ const datatype_t *key_type;
};
-const map_impl_t *MAP_TYPE_LIST = &ll_map_impl;
-
static node_t *node_alloc (void *key, uint64_t val) {
node_t *item = (node_t *)nbd_malloc(sizeof(node_t));
item->key = key;
return item;
}
-list_t *ll_alloc (cmp_fun_t cmp_fun, hash_fun_t hash_fun, clone_fun_t clone_fun) {
+list_t *ll_alloc (const datatype_t *key_type) {
list_t *ll = (list_t *)nbd_malloc(sizeof(list_t));
- ll->cmp_fun = cmp_fun;
- ll->clone_fun = clone_fun;
+ ll->key_type = key_type;
ll->head = node_alloc(NULL, 0);
ll->head->next = NULL;
return ll;
void ll_free (list_t *ll) {
node_t *item = ll->head->next;
while (item) {
- node_t *next = (node_t *)STRIP_TAG(item->next);
+ node_t *next = (node_t *)STRIP_TAG(item->next, TAG1);
nbd_free(item);
item = next;
}
uint64_t count = 0;
node_t *item = ll->head->next;
while (item) {
- count++;
- item = (node_t *)STRIP_TAG(item->next);
+ if (!IS_TAGGED(item->next, TAG1)) {
+ count++;
+ }
+ item = (node_t *)STRIP_TAG(item->next, TAG1);
}
return count;
}
node_t *next = item->next;
// A tag means an item is logically removed but not physically unlinked yet.
- while (EXPECT_FALSE(IS_TAGGED(next))) {
+ while (EXPECT_FALSE(IS_TAGGED(next, TAG1))) {
// Skip over logically removed items.
if (!help_remove) {
- item = (node_t *)STRIP_TAG(item->next);
+ item = (node_t *)STRIP_TAG(item->next, TAG1);
if (EXPECT_FALSE(item == NULL))
break;
TRACE("l3", "find_pred: skipping marked item %p (next is %p)", item, next);
// Unlink logically removed items.
node_t *other;
TRACE("l3", "find_pred: unlinking marked item %p next is %p", item, next);
- if ((other = SYNC_CAS(&pred->next, item, STRIP_TAG(next))) == item) {
+ if ((other = SYNC_CAS(&pred->next, item, STRIP_TAG(next, TAG1))) == item) {
TRACE("l2", "find_pred: unlinked item %p from pred %p", item, pred);
- item = (node_t *)STRIP_TAG(next);
+ item = (node_t *)STRIP_TAG(next, TAG1);
if (EXPECT_FALSE(item == NULL))
break;
next = item->next;
TRACE("l3", "find_pred: now current item is %p next is %p", item, next);
// The thread that completes the unlink should free the memory.
- if (ll->clone_fun != NULL) {
+ if (ll->key_type != NULL) {
nbd_defer_free((void*)other->key);
}
nbd_defer_free(other);
} else {
TRACE("l2", "find_pred: lost a race to unlink item %p from pred %p", item, pred);
TRACE("l2", "find_pred: pred's link changed to %p", other, 0);
- if (IS_TAGGED(other))
+ if (IS_TAGGED(other, TAG1))
return find_pred(pred_ptr, item_ptr, ll, key, help_remove); // retry
item = other;
if (EXPECT_FALSE(item == NULL))
TRACE("l4", "find_pred: key %p val %p", item->key, item->val);
int d;
- if (EXPECT_TRUE(ll->cmp_fun == NULL)) {
+ if (EXPECT_TRUE(ll->key_type == NULL)) {
d = (uint64_t)item->key - (uint64_t)key;
} else {
- d = ll->cmp_fun(item->key, key);
+ d = ll->key_type->cmp(item->key, key);
}
// If we reached the key (or passed where it should be), we found the right predesssor
// Create a new item and insert it into the list.
TRACE("l2", "ll_cas: attempting to insert item between %p and %p", pred, pred->next);
- void *new_key = (ll->clone_fun == NULL) ? key : ll->clone_fun(key);
+ void *new_key = (ll->key_type == NULL) ? key : ll->key_type->clone(key);
node_t *new_item = node_alloc(new_key, new_val);
node_t *next = new_item->next = old_item;
node_t *other = SYNC_CAS(&pred->next, next, new_item);
// Lost a race. Failed to insert the new item into the list.
TRACE("l1", "ll_cas: lost a race. CAS failed. expected pred's link to be %p but found %p", next, other);
- if (ll->clone_fun != NULL) {
+ if (ll->key_type != NULL) {
nbd_free(new_key);
}
nbd_free(new_item);
return DOES_NOT_EXIST;
}
- // Mark <item> removed. This must be atomic. If multiple threads try to remove the same item
- // only one of them should succeed.
+ // Mark <item> removed. If multiple threads try to remove the same item only one of them should succeed.
node_t *next;
node_t *old_next = item->next;
do {
next = old_next;
- old_next = SYNC_CAS(&item->next, next, TAG_VALUE(next));
- if (IS_TAGGED(old_next)) {
+ old_next = SYNC_CAS(&item->next, next, TAG_VALUE(next, TAG1));
+ if (IS_TAGGED(old_next, TAG1)) {
TRACE("l1", "ll_remove: lost a race -- %p is already marked for removal by another thread", item, 0);
return DOES_NOT_EXIST;
}
} while (next != old_next);
TRACE("l2", "ll_remove: logically removed item %p", item, 0);
- ASSERT(IS_TAGGED(item->next));
+ ASSERT(IS_TAGGED(item->next, TAG1));
- // This has to be an atomic swap in case another thread is updating the item while we are removing it.
+ // Atomically swap out the item's value in case another thread is updating the item while we are
+ // removing it. This establishes which operation occurs first logically, the update or the remove.
uint64_t val = SYNC_SWAP(&item->val, DOES_NOT_EXIST);
TRACE("l2", "ll_remove: replaced item's val %p with DOES_NOT_EXIT", val, 0);
}
// The thread that completes the unlink should free the memory.
- if (ll->clone_fun != NULL) {
+ if (ll->key_type != NULL) {
nbd_defer_free(item->key);
}
nbd_defer_free(item);
int i = 0;
while (item) {
node_t *next = item->next;
- if (IS_TAGGED(item)) {
+ if (IS_TAGGED(item, TAG1)) {
printf("*");
}
printf("%p:%p ", item, item->key);
fflush(stdout);
- item = (node_t *)STRIP_TAG(next);
+ item = (node_t *)STRIP_TAG(next, TAG1);
if (i++ > 30) {
printf("...");
break;
}
printf("\n");
}
+
+ll_iter_t *ll_iter_begin (list_t *ll, void *key) {
+ node_t *iter = node_alloc(0,0);
+ find_pred(NULL, &iter->next, ll, key, FALSE);
+ return iter;
+}
+
+uint64_t ll_iter_next (ll_iter_t *iter, void **key_ptr) {
+ assert(iter);
+ node_t *item = iter->next;
+ while (item != NULL && IS_TAGGED(item->next, TAG1)) {
+ item = (node_t *)STRIP_TAG(item->next, TAG1);
+ }
+ if (item == NULL) {
+ iter->next = NULL;
+ return DOES_NOT_EXIST;
+ }
+ iter->next = item->next;
+ if (key_ptr != NULL) {
+ *key_ptr = item->key;
+ }
+ return item->val;
+}
+
+void ll_iter_free (ll_iter_t *iter) {
+ nbd_free(iter);
+}
projects / nbds / blobdiff