greg/skiplist
1
0
Fork 0
Code Issues Pull requests 2 Packages Projects Releases Wiki Activity

snapshot v2/p4; fixes

Browse source
This commit is contained in:
Gregory Burd 2024-03-23 11:19:36 -04:00
parent 1b97e7b8d9
commit 128e134b32
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
include/sl.h
View file

@ -478,7 +478,10 @@
* c) determine if this is a duplicate, if so we set the \ * c) determine if this is a duplicate, if so we set the \
* sle.next[1] field to 0x1 as a reminder to re-insert \ * sle.next[1] field to 0x1 as a reminder to re-insert \
* this element as a duplicate in the restore function. \ * this element as a duplicate in the restore function. \
* d) ignore the head and the tail nodes in path[] \ * d) insert the node's copy into the slh_pres singly-linked \
* list. \
* Meanwhile, don't duplicate head and the tail nodes if they \
* are in the path[]. \
*/ \ */ \
for (i = 0; i < len; i++) { \ for (i = 0; i < len; i++) { \
if (path[i]->field.sle.gen < slist->gen) { \ if (path[i]->field.sle.gen < slist->gen) { \
@ -506,6 +509,13 @@
if (__skip_key_compare_##decl(slist, dest, dest->field.sle.next[0], slist->aux) == 0 || \ if (__skip_key_compare_##decl(slist, dest, dest->field.sle.next[0], slist->aux) == 0 || \
__skip_key_compare_##decl(slist, dest, dest->field.sle.prev, slist->aux) == 0) \ __skip_key_compare_##decl(slist, dest, dest->field.sle.prev, slist->aux) == 0) \
dest->field.sle.next[0] = (decl##_node_t *)0x1; \ dest->field.sle.next[0] = (decl##_node_t *)0x1; \
\
if (slist->slh_pres == NULL) \
slist->slh_pres = dest; \
else { \
dest->field.sle.next[0] = slist->slh_pres; \
slist->slh_pres = dest; \
} \
} \ } \
} \ } \
\ \
@ -906,8 +916,7 @@
* d) set slist's gen to `gen` \ * d) set slist's gen to `gen` \
* \ * \
* NOTES: \ * NOTES: \
* - the `node->field.sle.prev` in this context is actually the "next" \ * - the `node->field.sle.next[0]` forms a singly-linked list. \
* node in the `slh_pres` singly-linked list \
*/ \ */ \
\ \
SKIPLIST_EACH_H2T(decl, prefix, slist, node, i) \ SKIPLIST_EACH_H2T(decl, prefix, slist, node, i) \
@ -920,12 +929,12 @@
prev = NULL; \ prev = NULL; \
node = slist->slh_pres; \ node = slist->slh_pres; \
while (node) { \ while (node) { \
next = node->field.sle.prev; \ next = node->field.sle.next[0]; \
if (node->field.sle.gen > gen) { \ if (node->field.sle.gen > gen) { \
if (prev == NULL) \ if (prev == NULL) \
slist->slh_pres = next; \ slist->slh_pres = next; \
else \ else \
prev->field.sle.prev = next; \ prev->field.sle.next[0] = next; \
prefix##skip_free_node_##decl(node); \ prefix##skip_free_node_##decl(node); \
} \ } \
if (node->field.sle.gen == gen) { \ if (node->field.sle.gen == gen) { \
@ -960,12 +969,12 @@
prev = NULL; \ prev = NULL; \
node = slist->slh_pres; \ node = slist->slh_pres; \
while (node) { \ while (node) { \
next = node->field.sle.prev; \ next = node->field.sle.next[0]; \
if (node->field.sle.gen >= gen) { \ if (node->field.sle.gen >= gen) { \
if (prev == NULL) \ if (prev == NULL) \
slist->slh_pres = next; \ slist->slh_pres = next; \
else \ else \
prev->field.sle.prev = next; \ prev->field.sle.next[0] = next; \
prefix##skip_free_node_##decl(node); \ prefix##skip_free_node_##decl(node); \
} \ } \
prev = node; \ prev = node; \