Skip to content

Use eight level of critnibs in the tracker #1143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/umf/base.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ typedef enum umf_result_t {
6, ///< Failure in user provider code (i.e in user provided callback)
UMF_RESULT_ERROR_DEPENDENCY_UNAVAILABLE =
7, ///< External required dependency is unavailable or missing
UMF_RESULT_ERROR_UNKNOWN = 0x7ffffffe ///< Unknown or internal error
UMF_RESULT_ERROR_OUT_OF_RESOURCES = 8, ///< Out of internal resources
UMF_RESULT_ERROR_UNKNOWN = 0x7ffffffe ///< Unknown error
} umf_result_t;

#ifdef __cplusplus
Expand Down
6 changes: 4 additions & 2 deletions src/critnib/critnib.c
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,9 @@ static struct critnib_leaf *find_successor(struct critnib_node *__restrict n) {
while (1) {
unsigned nib;
for (nib = 0; nib <= NIB; nib++) {
if (n->child[nib]) {
struct critnib_node *m;
utils_atomic_load_acquire_ptr((void **)&n->child[nib], (void **)&m);
if (m) {
break;
}
}
Expand All @@ -654,7 +656,7 @@ static struct critnib_leaf *find_successor(struct critnib_node *__restrict n) {
return NULL;
}

n = n->child[nib];
utils_atomic_load_acquire_ptr((void **)&n->child[nib], (void **)&n);

if (!n) {
return NULL;
Expand Down
Loading
Loading