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

integrity p3

Browse source
This commit is contained in:
Gregory Burd 2024-03-22 15:50:44 -04:00
parent 35f04e9d59
commit 11a96bdb6e
1 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
include/sl.h
View file

@ -453,14 +453,13 @@
return -1; \ return -1; \
} \ } \
level = __skip_toss_##decl(slist->max - 1); \ level = __skip_toss_##decl(slist->max - 1); \
n->field.sle.height = level + 1; \ n->field.sle.height = level; \
for (i = 0; i <= level; i++) { \ for (i = slist->slh_head->field.sle.height + 1; i < n->field.sle.height + 1; i++) { \
if (i <= slist->slh_head->field.sle.height) { \ path[i + 1] = slist->slh_tail; \
n->field.sle.next[i] = path[i + 1]->field.sle.next[i]; \ } \
path[i + 1]->field.sle.next[i] = n; \ for (i = 0; i < n->field.sle.height + 1; i++) { \
} else { \ n->field.sle.next[i] = path[i + 1]->field.sle.next[i]; \
n->field.sle.next[i] = slist->slh_tail; \ path[i + 1]->field.sle.next[i] = n; \
} \
} \ } \
n->field.sle.prev = path[1]; \ n->field.sle.prev = path[1]; \
n->field.sle.next[0]->field.sle.prev = n; \ n->field.sle.next[0]->field.sle.prev = n; \
@ -1058,24 +1057,32 @@
} \ } \
\ \
node = slist->slh_head; \ node = slist->slh_head; \
for (nth = 0; nth < node->field.sle.height; nth++) { \ for (nth = 0; nth < node->field.sle.height; nth++) { \
if (node->field.sle.next[nth] == NULL || node->field.sle.next[nth] == slist->slh_tail) { \ if (node->field.sle.next[nth] == NULL) { \
__skip_integrity_failure_##decl("the head's %u next node reference should not be NULL or pointing to the tail", nth); \ __skip_integrity_failure_##decl("the head's %u next node should not be NULL", nth); \
n_err++; \ n_err++; \
if (flags) \ if (flags) \
return n_err; \ return n_err; \
} \ } \
if (node->field.sle.next[nth] == slist->slh_tail) \
break; \
} \ } \
for (; nth < slist->max; nth++) { \ for (; nth < node->field.sle.height; nth++) { \
if (node->field.sle.next[nth] == NULL) { \
__skip_integrity_failure_##decl("the head's %u next node should not be NULL", nth); \
n_err++; \
if (flags) \
return n_err; \
} \
if (node->field.sle.next[nth] != slist->slh_tail) { \ if (node->field.sle.next[nth] != slist->slh_tail) { \
__skip_integrity_failure_##decl("the head's %u next node reference above it's current height should always point to the tail", nth); \ __skip_integrity_failure_##decl("after internal nodes, the head's %u next node should always be the tail", nth); \
n_err++; \ n_err++; \
if (flags) \ if (flags) \
return n_err; \ return n_err; \
} \ } \
} \ } \
\ \
if (slist->length > 0 && slist->slh_tail->field.sle.prev != slist->slh_head) { \ if (slist->length > 0 && slist->slh_tail->field.sle.prev == slist->slh_head) { \
__skip_integrity_failure_##decl("slist->length is 0, but tail->prev == head, not an internal node"); \ __skip_integrity_failure_##decl("slist->length is 0, but tail->prev == head, not an internal node"); \
n_err++; \ n_err++; \
if (flags) \ if (flags) \
@ -1104,7 +1111,9 @@
if (flags) \ if (flags) \
return n_err; \ return n_err; \
} \ } \
if (*this->next != node + (sizeof(struct __skiplist_##decl_idx) * slist->max)) { \ uintptr_t a = (uintptr_t)this->next; \
uintptr_t b = (intptr_t)((uintptr_t)node + sizeof(decl##_node_t)); \
if (a != b) { \
__skip_integrity_failure_##decl("the %u node's [%p] next field isn't at the proper offset relative to the node", nth, (void *)node); \ __skip_integrity_failure_##decl("the %u node's [%p] next field isn't at the proper offset relative to the node", nth, (void *)node); \
n_err++; \ n_err++; \
if (flags) \ if (flags) \