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

ASAN/LSAN more fixes, now including snapshots

Browse source
This commit is contained in:
Gregory Burd 2024-04-03 10:13:58 -04:00
parent 5ccae6decf
commit 397259c09d
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/slm.c
View file

@ -20,7 +20,7 @@
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#define TEST_ARRAY_SIZE 1000 #define TEST_ARRAY_SIZE 1000
#define VALIDATE #define VALIDATE
//define SNAPSHOTS #define SNAPSHOTS
#define DOT #define DOT
#ifdef DOT #ifdef DOT
size_t gen = 0; size_t gen = 0;

15
include/sl.h
View file

@ -798,7 +798,7 @@ void __attribute__((format(printf, 4, 5))) __skip_diag_(const char *file, int li
new->field.sle_levels[lvl].next = slist->slh_tail; \ new->field.sle_levels[lvl].next = slist->slh_tail; \
} \ } \
/* Adjust all forward pointers for each element in the path. */ \ /* Adjust all forward pointers for each element in the path. */ \
for (i = 0; i <= new_height; i++) { \ for (i = 0; i <= new_height; i++) { \
/* The tail's next[i] is always NULL, we don't want that in the \ /* The tail's next[i] is always NULL, we don't want that in the \
next[i] for our new node. Also, don't set the tail's next[i] \ next[i] for our new node. Also, don't set the tail's next[i] \
because it is always NULL. */ \ because it is always NULL. */ \
@ -1208,11 +1208,11 @@ void __attribute__((format(printf, 4, 5))) __skip_diag_(const char *file, int li
if (slist == NULL) \ if (slist == NULL) \
return; \ return; \
\ \
prefix##skip_release_##decl(slist); \
\
if (slist->slh_fns.release_snapshots) \ if (slist->slh_fns.release_snapshots) \
slist->slh_fns.release_snapshots(slist); \ slist->slh_fns.release_snapshots(slist); \
\ \
prefix##skip_release_##decl(slist); \
\
free(slist->slh_head); \ free(slist->slh_head); \
free(slist->slh_tail); \ free(slist->slh_tail); \
} }
@ -1247,6 +1247,7 @@ void __attribute__((format(printf, 4, 5))) __skip_diag_(const char *file, int li
prefix##skip_free_node_##decl(slist, node); \ prefix##skip_free_node_##decl(slist, node); \
node = next; \ node = next; \
} \ } \
slist->slh_snap.pres = NULL; \
slist->slh_snap.era = 0; \ slist->slh_snap.era = 0; \
} \ } \
\ \
@ -1354,7 +1355,7 @@ void __attribute__((format(printf, 4, 5))) __skip_diag_(const char *file, int li
* can no longer access any generations > `era`. \ * can no longer access any generations > `era`. \
* \ * \
* ALGORITHM: \ * ALGORITHM: \
* iterate over the preserved nodes (slist->slh_pres) \ * iterate over the preserved nodes (slist->slh_snap.pres) \
* a) remove/free nodes with node->era > era from slist \ * a) remove/free nodes with node->era > era from slist \
* b) remove/free nodes > era from slh_pres \ * b) remove/free nodes > era from slh_pres \
* c) restore nodes == era by... \ * c) restore nodes == era by... \
@ -1398,11 +1399,13 @@ void __attribute__((format(printf, 4, 5))) __skip_diag_(const char *file, int li
slist->slh_snap.pres = node->field.sle_levels[0].next; \ slist->slh_snap.pres = node->field.sle_levels[0].next; \
else { \ else { \
if (node->field.sle_levels[0].next == NULL) \ if (node->field.sle_levels[0].next == NULL) \
prev->field.sle_levels[0].next = NULL; \ if (node == slist->slh_snap.pres) \
slist->slh_snap.pres = NULL; \
else \
prev->field.sle_levels[0].next = NULL; \
else \ else \
prev->field.sle_levels[0].next = node->field.sle_levels[0].next; \ prev->field.sle_levels[0].next = node->field.sle_levels[0].next; \
} \ } \
\
prefix##skip_free_node_##decl(slist, node); \ prefix##skip_free_node_##decl(slist, node); \
} \ } \
\ \