X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=struct%2Flist.c;h=94822fc54d6b607e4588dd211d565c43a8809c11;hp=c6c1780547f60825176bf0c9ec63cffcb1dded97;hb=bfb84a32cb183c37bf4c7a4522f65a1173dcecd4;hpb=a1fae129c758d7ea83dfdbb5f14ec1df12f0aa34 diff --git a/struct/list.c b/struct/list.c index c6c1780..94822fc 100644 --- a/struct/list.c +++ b/struct/list.c @@ -10,47 +10,51 @@ #include "common.h" #include "struct.h" +#include "nstring.h" #include "mem.h" typedef struct node { - uint64_t key; + nstring_t *key; uint64_t value; struct node *next; } node_t; -typedef struct ll { +struct ll { node_t *head; -} list_t; +}; -node_t *node_alloc (uint64_t key, uint64_t value) { +static node_t *node_alloc (const void *key_data, uint32_t key_len, uint64_t value) { node_t *item = (node_t *)nbd_malloc(sizeof(node_t)); memset(item, 0, sizeof(node_t)); - item->key = key; + // If is -1 it indicates is an integer and not a pointer + item->key = (key_len == (unsigned)-1) + ? (void *)TAG_VALUE(key_data) + : ns_alloc(key_data, key_len); item->value = value; return item; } list_t *ll_alloc (void) { list_t *ll = (list_t *)nbd_malloc(sizeof(list_t)); - ll->head = node_alloc((uint64_t)-1, 0); + ll->head = node_alloc(" ", 0, 0); ll->head->next = NULL; return ll; } -static node_t *find_pred (node_t **pred_ptr, list_t *ll, uint64_t key, int help_remove) { +static node_t *find_pred (node_t **pred_ptr, list_t *ll, const void *key_data, uint32_t key_len, int help_remove) { node_t *pred = ll->head; node_t *item = pred->next; - TRACE("l3", "find_pred: searching for key %p in ll (head is %p)", key, pred); + TRACE("l3", "find_pred: searching for key %p in ll (head is %p)", key_data, pred); while (item != NULL) { node_t *next = item->next; TRACE("l3", "find_pred: visiting item %p (next %p)", item, next); - TRACE("l3", "find_pred: key %p", item->key, item->value); + TRACE("l3", "find_pred: key %p", STRIP_TAG(item->key), item->value); - // Marked items are logically removed, but not unlinked yet. + // A tag means an item is logically removed but not physically unlinked yet. while (EXPECT_FALSE(IS_TAGGED(next))) { - // Skip over partially removed items. + // Skip over logically removed items. if (!help_remove) { item = (node_t *)STRIP_TAG(item->next); if (EXPECT_FALSE(item == NULL)) @@ -59,7 +63,7 @@ static node_t *find_pred (node_t **pred_ptr, list_t *ll, uint64_t key, int help_ continue; } - // Unlink partially removed items. + // Unlink logically removed items. node_t *other; if ((other = SYNC_CAS(&pred->next, item, STRIP_TAG(next))) == item) { item = (node_t *)STRIP_TAG(next); @@ -74,7 +78,7 @@ static node_t *find_pred (node_t **pred_ptr, list_t *ll, uint64_t key, int help_ } else { TRACE("l3", "find_pred: lost race to unlink from pred %p; its link changed to %p", pred, other); if (IS_TAGGED(other)) - return find_pred(pred_ptr, ll, key, help_remove); // retry + return find_pred(pred_ptr, ll, key_data, key_len, help_remove); // retry item = other; if (EXPECT_FALSE(item == NULL)) break; @@ -86,12 +90,15 @@ static node_t *find_pred (node_t **pred_ptr, list_t *ll, uint64_t key, int help_ break; // If we reached the key (or passed where it should be), we found the right predesssor - if (item->key >= key) { + int x = (IS_TAGGED(item->key)) + ? (STRIP_TAG(item->key) - (uint64_t)key_data) + : ns_cmp_raw(item->key, key_data, key_len); + if (x >= 0) { TRACE("l3", "find_pred: found pred %p item %p", pred, item); if (pred_ptr != NULL) { *pred_ptr = pred; } - return item; + return x == 0 ? item : NULL; } pred = item; @@ -107,31 +114,32 @@ static node_t *find_pred (node_t **pred_ptr, list_t *ll, uint64_t key, int help_ } // Fast find. Do not help unlink partially removed nodes and do not return the found item's predecessor. -uint64_t ll_lookup (list_t *ll, uint64_t key) { - TRACE("l3", "ll_lookup: searching for key %p in ll %p", key, ll); - node_t *item = find_pred(NULL, ll, key, FALSE); +uint64_t ll_lookup (list_t *ll, const void *key_data, uint32_t key_len) { + TRACE("l3", "ll_lookup: searching for key %p in ll %p", key_data, ll); + node_t *item = find_pred(NULL, ll, key_data, key_len, FALSE); - // If we found an matching the return its value. - return (item && item->key == key) ? item->value : DOES_NOT_EXIST; + // If we found an matching the key return its value. + return item != NULL ? item->value : DOES_NOT_EXIST; } -// Insert the , if it doesn't already exist in -uint64_t ll_add (list_t *ll, uint64_t key, uint64_t value) { - TRACE("l3", "ll_add: inserting key %p value %p", key, value); +// Insert a new item if a matching key doesn't already exist in +uint64_t ll_add (list_t *ll, const void *key_data, uint32_t key_len, uint64_t value) { + TRACE("l3", "ll_add: inserting key %p value %p", key_data, value); node_t *pred; node_t *item = NULL; do { - node_t *next = find_pred(&pred, ll, key, TRUE); + node_t *next = find_pred(&pred, ll, key_data, key_len, TRUE); - // If a node matching already exists in , return its value. - if (next != NULL && next->key == key) { + // If a node matching the key already exists in return its value. + if (next != NULL) { TRACE("l3", "ll_add: there is already an item %p (value %p) with the same key", next, next->value); if (EXPECT_FALSE(item != NULL)) { nbd_free(item); } return next->value; } + next = pred->next; TRACE("l3", "ll_add: attempting to insert item between %p and %p", pred, next); - if (EXPECT_TRUE(item == NULL)) { item = node_alloc(key, value); } + if (EXPECT_TRUE(item == NULL)) { item = node_alloc(key_data, key_len, value); } item->next = next; node_t *other = SYNC_CAS(&pred->next, next, item); if (other == next) { @@ -143,11 +151,11 @@ uint64_t ll_add (list_t *ll, uint64_t key, uint64_t value) { } while (1); } -uint64_t ll_remove (list_t *ll, uint64_t key) { - TRACE("l3", "ll_remove: removing item with key %p from ll %p", key, ll); +uint64_t ll_remove (list_t *ll, const void *key_data, uint32_t key_len) { + TRACE("l3", "ll_remove: removing item with key %p from ll %p", key_data, ll); node_t *pred; - node_t *item = find_pred(&pred, ll, key, TRUE); - if (item == NULL || item->key != key) { + node_t *item = find_pred(&pred, ll, key_data, key_len, TRUE); + if (item == NULL) { TRACE("l3", "ll_remove: remove failed, an item with a matching key does not exist in the ll", 0, 0); return DOES_NOT_EXIST; } @@ -185,99 +193,13 @@ void ll_print (list_t *ll) { node_t *item; item = ll->head->next; while (item) { - printf("0x%llx ", item->key); + if (IS_TAGGED(item->key)) { + printf("0x%llx ", STRIP_TAG(item->key)); + } else { + printf("%s ", (char *)ns_data(item->key)); + } fflush(stdout); item = item->next; } printf("\n"); } - -#ifdef MAKE_list_test -#include -#include -#include - -#include "runtime.h" - -#define NUM_ITERATIONS 10000000 - -static volatile int wait_; -static long num_threads_; -static list_t *ll_; - -void *worker (void *arg) { - - // Wait for all the worker threads to be ready. - SYNC_ADD(&wait_, -1); - do {} while (wait_); - - for (int i = 0; i < NUM_ITERATIONS/num_threads_; ++i) { - unsigned r = nbd_rand(); - int key = r & 0xF; - if (r & (1 << 8)) { - ll_add(ll_, key, 1); - } else { - ll_remove(ll_, key); - } - - rcu_update(); - } - - return NULL; -} - -int main (int argc, char **argv) { - nbd_init(); - //lwt_set_trace_level("m0l0"); - - char* program_name = argv[0]; - pthread_t thread[MAX_NUM_THREADS]; - - if (argc > 2) { - fprintf(stderr, "Usage: %s num_threads\n", program_name); - return -1; - } - - num_threads_ = 2; - if (argc == 2) - { - errno = 0; - num_threads_ = strtol(argv[1], NULL, 10); - if (errno) { - fprintf(stderr, "%s: Invalid argument for number of threads\n", program_name); - return -1; - } - if (num_threads_ <= 0) { - fprintf(stderr, "%s: Number of threads must be at least 1\n", program_name); - return -1; - } - if (num_threads_ > MAX_NUM_THREADS) { - fprintf(stderr, "%s: Number of threads cannot be more than %d\n", program_name, MAX_NUM_THREADS); - return -1; - } - } - - ll_ = ll_alloc(); - - struct timeval tv1, tv2; - gettimeofday(&tv1, NULL); - - wait_ = num_threads_; - - for (int i = 0; i < num_threads_; ++i) { - int rc = nbd_thread_create(thread + i, i, worker, (void*)(size_t)i); - if (rc != 0) { perror("pthread_create"); return rc; } - } - - for (int i = 0; i < num_threads_; ++i) { - pthread_join(thread[i], NULL); - } - - gettimeofday(&tv2, NULL); - int ms = (int)(1000000*(tv2.tv_sec - tv1.tv_sec) + tv2.tv_usec - tv1.tv_usec) / 1000; - ll_print(ll_); - printf("Th:%ld Time:%dms\n", num_threads_, ms); - - return 0; -} -#endif//list_test