-node_t *node_alloc (int level, uint64_t key, uint64_t value) {
+node_t *node_alloc (int level, const void *key_data, uint32_t key_len, uint64_t value) {
assert(level >= 0 && level <= MAX_LEVEL);
size_t sz = sizeof(node_t) + (level + 1) * sizeof(node_t *);
node_t *item = (node_t *)nbd_malloc(sz);
memset(item, 0, sz);
assert(level >= 0 && level <= MAX_LEVEL);
size_t sz = sizeof(node_t) + (level + 1) * sizeof(node_t *);
node_t *item = (node_t *)nbd_malloc(sz);
memset(item, 0, sz);
-static node_t *find_preds (node_t *preds[MAX_LEVEL+1], int n, skiplist_t *sl, uint64_t key, int help_remove) {
+static node_t *find_preds (int *found, node_t *preds[MAX_LEVEL+1], int n, skiplist_t *sl, const void *key_data, uint32_t key_len, int help_remove) {
- TRACE("s3", "find_preds: searching for key %p in sl (head is %p)", key, pred);
+ TRACE("s3", "find_preds: searching for key %p in sl (head is %p)", key_data, pred);
+ *found = 0;
item = pred->next[level];
if (EXPECT_FALSE(IS_TAGGED(item))) {
TRACE("s3", "find_preds: pred %p is marked for removal (item %p); retry", pred, item);
item = pred->next[level];
if (EXPECT_FALSE(IS_TAGGED(item))) {
TRACE("s3", "find_preds: pred %p is marked for removal (item %p); retry", pred, item);
- return find_preds(preds, n, sl, key, help_remove); // retry
+ return find_preds(found, preds, n, sl, key_data, key_len, help_remove); // retry
}
while (item != NULL) {
node_t *next = item->next[level];
TRACE("s3", "find_preds: visiting item %p (next %p)", item, next);
TRACE("s3", "find_preds: key %p", item->key, 0);
}
while (item != NULL) {
node_t *next = item->next[level];
TRACE("s3", "find_preds: visiting item %p (next %p)", item, next);
TRACE("s3", "find_preds: key %p", item->key, 0);
node_t *other;
if ((other = SYNC_CAS(&pred->next[level], item, STRIP_TAG(next))) == item) {
item = (node_t *)STRIP_TAG(next);
node_t *other;
if ((other = SYNC_CAS(&pred->next[level], item, STRIP_TAG(next))) == item) {
item = (node_t *)STRIP_TAG(next);
} else {
TRACE("s3", "find_preds: lost race to unlink from pred %p; its link changed to %p", pred, other);
if (IS_TAGGED(other))
} else {
TRACE("s3", "find_preds: lost race to unlink from pred %p; its link changed to %p", pred, other);
if (IS_TAGGED(other))
- return find_preds(preds, n, sl, key, help_remove); // retry
+ return find_preds(found, preds, n, sl, key_data, key_len, help_remove); // retry
TRACE("s3", "find_preds: found pred %p item %p", pred, item);
break;
}
TRACE("s3", "find_preds: found pred %p item %p", pred, item);
break;
}
TRACE("s3", "sl_lookup: searching for key %p in sl %p", key, sl);
TRACE("s3", "sl_lookup: searching for key %p in sl %p", key, sl);
- node_t *item = find_preds(NULL, 0, sl, key, FALSE);
+ int found;
+ node_t *item = find_preds(&found, NULL, 0, sl, key_data, key_len, FALSE);
-uint64_t sl_add (skiplist_t *sl, uint64_t key, uint64_t value) {
+uint64_t sl_add (skiplist_t *sl, const void *key_data, uint32_t key_len, uint64_t value) {
TRACE("s3", "sl_add: inserting key %p value %p", key, value);
node_t *preds[MAX_LEVEL+1];
node_t *item = NULL;
TRACE("s3", "sl_add: inserting key %p value %p", key, value);
node_t *preds[MAX_LEVEL+1];
node_t *item = NULL;
- int n = random_level();
- node_t *next = find_preds(preds, n, sl, key, TRUE);
+ int found;
+ node_t *next = find_preds(&found, preds, n, sl, key_data, key_len, TRUE);
TRACE("s3", "sl_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;
}
// First insert <item> into the bottom level.
TRACE("s3", "sl_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;
}
// First insert <item> into the bottom level.
- if (EXPECT_TRUE(item == NULL)) { item = node_alloc(n, key, value); }
+ if (EXPECT_TRUE(item == NULL)) { item = node_alloc(n, key_data, key_len, value); }
TRACE("s3", "sl_add: attempting to insert item between %p and %p", preds[0], next);
item->next[0] = next;
for (int level = 1; level <= item->top_level; ++level) {
TRACE("s3", "sl_add: attempting to insert item between %p and %p", preds[0], next);
item->next[0] = next;
for (int level = 1; level <= item->top_level; ++level) {
- find_preds(preds, item->top_level, sl, key, TRUE);
+ int found;
+ find_preds(&found, preds, item->top_level, sl, key_data, key_len, TRUE);
-uint64_t sl_remove (skiplist_t *sl, uint64_t key) {
- TRACE("s3", "sl_remove: removing item with key %p from sl %p", key, sl);
+uint64_t sl_remove (skiplist_t *sl, const void *key_data, uint32_t key_len) {
+ TRACE("s3", "sl_remove: removing item with key %p from sl %p", key_data, sl);
+ int found;
- node_t *item = find_preds(preds, -1, sl, key, TRUE);
- if (item == NULL || item->key != key) {
+ node_t *item = find_preds(&found, preds, -1, sl, key_data, key_len, TRUE);
+ if (!found) {
TRACE("s3", "sl_remove: remove failed, an item with a matching key does not exist in the sl", 0, 0);
return DOES_NOT_EXIST;
}
TRACE("s3", "sl_remove: remove failed, an item with a matching key does not exist in the sl", 0, 0);
return DOES_NOT_EXIST;
}
- printf("%s%p:0x%llx ", is_marked ? "*" : "", item, item->key);
+ printf("%s%p:%s ", is_marked ? "*" : "", item, (char *)ns_data(item->key));