#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 list {
+struct ll {
node_t *head;
- node_t *last;
-} 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 <key_len> is -1 it indicates <key_data> 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 *list = (list_t *)nbd_malloc(sizeof(list_t));
- list->head = node_alloc(0, 0);
- list->last = node_alloc((uint64_t)-1, 0);
- list->head->next = list->last;
- return list;
+ list_t *ll = (list_t *)nbd_malloc(sizeof(list_t));
+ ll->head = node_alloc(" ", 0, 0);
+ ll->head->next = NULL;
+ return ll;
}
-static node_t *find_pred (node_t **pred_ptr, list_t *list, uint64_t key, int help_remove) {
- node_t *pred = list->head;
+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 list (head is %p)", key, pred);
-#ifndef NDEBUG
- int count = 0;
-#endif
+ TRACE("l3", "find_pred: searching for key %p in ll (head is %p)", key_data, pred);
- do {
+ 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))
+ break;
next = item->next;
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);
+ if (EXPECT_FALSE(item == NULL))
+ break;
next = item->next;
TRACE("l3", "find_pred: unlinked item %p from pred %p", item, pred);
TRACE("l3", "find_pred: now item is %p next is %p", item, next);
// The thread that completes the unlink should free the memory.
nbd_defer_free(other);
} else {
- TRACE("l3", "find_pred: lost race to unlink item from pred %p; its link changed to %p", pred, other);
+ 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, list, 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;
next = item->next;
}
}
+ if (EXPECT_FALSE(item == NULL))
+ 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;
}
- assert(count++ < 18);
pred = item;
item = next;
- } while (1);
+ }
+
+ // <key> is not in <ll>.
+ if (pred_ptr != NULL) {
+ *pred_ptr = pred;
+ }
+ return NULL;
}
// Fast find. Do not help unlink partially removed nodes and do not return the found item's predecessor.
-uint64_t ll_lookup (list_t *list, uint64_t key) {
- TRACE("l3", "ll_lookup: searching for key %p in list %p", key, list);
- node_t *item = find_pred(NULL, list, 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 <item> matching the <key> return its value.
- return (item->key == key) ? item->value : DOES_NOT_EXIST;
+ // If we found an <item> matching the key return its value.
+ return item != NULL ? item->value : DOES_NOT_EXIST;
}
-// Insert the <key>, if it doesn't already exist in the <list>
-uint64_t ll_add (list_t *list, 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 <ll>
+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, list, key, TRUE);
+ node_t *next = find_pred(&pred, ll, key_data, key_len, TRUE);
- // If a node matching <key> already exists in the list, return its value.
- if (next->key == key) {
+ // If a node matching the key already exists in <ll> 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) {
} while (1);
}
-uint64_t ll_remove (list_t *list, uint64_t key) {
- TRACE("l3", "ll_remove: removing item with key %p from list %p", key, list);
+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, list, key, TRUE);
- if (item->key != key) {
- TRACE("l3", "ll_remove: remove failed, an item with a matching key does not exist in the list", 0, 0);
+ 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;
}
uint64_t value = item->value;
- // Unlink <item> from the list.
+ // Unlink <item> from <ll>.
TRACE("l3", "ll_remove: link item's pred %p to it's successor %p", pred, next);
node_t *other;
if ((other = SYNC_CAS(&pred->next, item, next)) != item) {
TRACE("l3", "ll_remove: unlink failed; pred's link changed from %p to %p", item, other);
// By marking the item earlier, we logically removed it. It is safe to leave the item.
- // Another thread will finish physically removing it from the list.
+ // Another thread will finish physically removing it from the ll.
return value;
}
return value;
}
-void ll_print (list_t *list) {
+void ll_print (list_t *ll) {
node_t *item;
- item = list->head;
+ 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 <errno.h>
-#include <pthread.h>
-#include <sys/time.h>
-
-#include "runtime.h"
-
-#define NUM_ITERATIONS 10000000
-
-static volatile int wait_;
-static long num_threads_;
-static list_t *ll_;
-
-void *worker (void *arg) {
- int id = (int)(size_t)arg;
-
- unsigned int rand_seed = id+1;//rdtsc_l();
-
- // 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) {
- int n = rand_r(&rand_seed);
- int key = (n & 0xF) + 1;
- if (n & (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;
- printf("Th:%ld Time:%dms\n", num_threads_, ms);
- ll_print(ll_);
- lwt_dump("lwt.out");
-
- return 0;
-}
-#endif//list_test