X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=map%2Flist.c;h=a94d2d00594274b2e2b7b661b697667ab8802d26;hp=979c91e10477de67af9ebeadeea6e539527eb521;hb=dbcd4739e02b8e774e28b752c412d7e2f242cd47;hpb=f1098084dd54496a61f9a254541190df77edd166 diff --git a/map/list.c b/map/list.c index 979c91e..a94d2d0 100644 --- a/map/list.c +++ b/map/list.c @@ -10,7 +10,7 @@ #include #include "common.h" -#include "mlocal.h" +#include "list.h" #include "mem.h" typedef struct node { @@ -21,17 +21,9 @@ typedef struct node { struct ll { node_t *head; - cmp_fun_t cmp_fun; - clone_fun_t clone_fun; + const datatype_t *key_type; }; -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 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; @@ -39,10 +31,9 @@ static node_t *node_alloc (void *key, uint64_t val) { 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; @@ -51,7 +42,7 @@ list_t *ll_alloc (cmp_fun_t cmp_fun, hash_fun_t hash_fun, clone_fun_t clone_fun) 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; } @@ -61,8 +52,10 @@ uint64_t ll_count (list_t *ll) { 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; } @@ -76,11 +69,11 @@ static int find_pred (node_t **pred_ptr, node_t **item_ptr, list_t *ll, void *ke 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); @@ -91,23 +84,23 @@ static int find_pred (node_t **pred_ptr, node_t **item_ptr, list_t *ll, void *ke // 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)) @@ -123,10 +116,10 @@ static int find_pred (node_t **pred_ptr, node_t **item_ptr, list_t *ll, void *ke 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 @@ -195,7 +188,7 @@ uint64_t ll_cas (list_t *ll, void *key, uint64_t expectation, uint64_t new_val) // 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); @@ -206,7 +199,7 @@ uint64_t ll_cas (list_t *ll, void *key, uint64_t expectation, uint64_t new_val) // 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); @@ -254,22 +247,22 @@ uint64_t ll_remove (list_t *ll, void *key) { return DOES_NOT_EXIST; } - // Mark removed. This must be atomic. If multiple threads try to remove the same item - // only one of them should succeed. + // Mark 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); @@ -284,7 +277,7 @@ uint64_t ll_remove (list_t *ll, void *key) { } // 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); @@ -298,12 +291,12 @@ void ll_print (list_t *ll) { 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;