diff options
author | Richard Braun <rbraun@sceen.net> | 2017-07-25 21:04:13 +0200 |
---|---|---|
committer | Richard Braun <rbraun@sceen.net> | 2017-07-25 21:04:13 +0200 |
commit | 92b58ff6e9a2a82e5abb86b4e926d4fa22dfc2a3 (patch) | |
tree | 908ca23cd945e0593a49214ab89eab17e0709776 /rdxtree.c | |
parent | 56fd1f5d9aabdbae8e694e9268875268a2811740 (diff) |
Rename llsync accessors
Diffstat (limited to 'rdxtree.c')
-rw-r--r-- | rdxtree.c | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -215,7 +215,7 @@ rdxtree_node_insert(struct rdxtree_node *node, unsigned short index, assert(node->entries[index] == NULL); node->nr_entries++; - llsync_assign_ptr(node->entries[index], entry); + llsync_store_ptr(node->entries[index], entry); } static inline void @@ -232,7 +232,7 @@ rdxtree_node_remove(struct rdxtree_node *node, unsigned short index) assert(node->entries[index] != NULL); node->nr_entries--; - llsync_assign_ptr(node->entries[index], NULL); + llsync_store_ptr(node->entries[index], NULL); } static inline void * @@ -244,7 +244,7 @@ rdxtree_node_find(struct rdxtree_node *node, unsigned short *indexp) index = *indexp; while (index < ARRAY_SIZE(node->entries)) { - ptr = rdxtree_entry_addr(llsync_read_ptr(node->entries[index])); + ptr = rdxtree_entry_addr(llsync_load_ptr(node->entries[index])); if (ptr != NULL) { *indexp = index; @@ -332,7 +332,7 @@ rdxtree_shrink(struct rdxtree *tree) rdxtree_node_unlink(rdxtree_entry_addr(entry)); } - llsync_assign_ptr(tree->root, entry); + llsync_store_ptr(tree->root, entry); rdxtree_node_schedule_destruction(node); } } @@ -380,7 +380,7 @@ rdxtree_grow(struct rdxtree *tree, rdxtree_key_t key) rdxtree_node_insert(node, 0, tree->root); tree->height++; - llsync_assign_ptr(tree->root, rdxtree_node_to_entry(node)); + llsync_store_ptr(tree->root, rdxtree_node_to_entry(node)); root = node; } while (new_height > tree->height); @@ -403,7 +403,7 @@ rdxtree_cleanup(struct rdxtree *tree, struct rdxtree_node *node) if (node->parent == NULL) { tree->height = 0; - llsync_assign_ptr(tree->root, NULL); + llsync_store_ptr(tree->root, NULL); rdxtree_node_schedule_destruction(node); break; } @@ -458,7 +458,7 @@ rdxtree_insert_common(struct rdxtree *tree, rdxtree_key_t key, return ERROR_BUSY; } - llsync_assign_ptr(tree->root, ptr); + llsync_store_ptr(tree->root, ptr); if (slotp != NULL) { *slotp = &tree->root; @@ -486,7 +486,7 @@ rdxtree_insert_common(struct rdxtree *tree, rdxtree_key_t key, } if (prev == NULL) { - llsync_assign_ptr(tree->root, rdxtree_node_to_entry(node)); + llsync_store_ptr(tree->root, rdxtree_node_to_entry(node)); } else { rdxtree_node_link(node, prev, index); rdxtree_node_insert_node(prev, index, node); @@ -535,7 +535,7 @@ rdxtree_insert_alloc_common(struct rdxtree *tree, void *ptr, if (unlikely(height == 0)) { if (tree->root == NULL) { - llsync_assign_ptr(tree->root, ptr); + llsync_store_ptr(tree->root, ptr); *keyp = 0; if (slotp != NULL) { @@ -631,7 +631,7 @@ rdxtree_remove(struct rdxtree *tree, rdxtree_key_t key) node = rdxtree_entry_addr(tree->root); if (unlikely(height == 0)) { - llsync_assign_ptr(tree->root, NULL); + llsync_store_ptr(tree->root, NULL); return node; } @@ -670,7 +670,7 @@ rdxtree_lookup_common(const struct rdxtree *tree, rdxtree_key_t key, unsigned short height, shift, index; void *entry; - entry = llsync_read_ptr(tree->root); + entry = llsync_load_ptr(tree->root); if (entry == NULL) { node = NULL; @@ -701,7 +701,7 @@ rdxtree_lookup_common(const struct rdxtree *tree, rdxtree_key_t key, prev = node; index = (unsigned short)(key >> shift) & RDXTREE_RADIX_MASK; - entry = llsync_read_ptr(node->entries[index]); + entry = llsync_load_ptr(node->entries[index]); node = rdxtree_entry_addr(entry); shift -= RDXTREE_RADIX; height--; @@ -725,7 +725,7 @@ rdxtree_replace_slot(void **slot, void *ptr) old = *slot; assert(old != NULL); rdxtree_assert_alignment(old); - llsync_assign_ptr(*slot, ptr); + llsync_store_ptr(*slot, ptr); return old; } @@ -737,7 +737,7 @@ rdxtree_walk_next(struct rdxtree *tree, struct rdxtree_iter *iter) rdxtree_key_t key; void *entry; - entry = llsync_read_ptr(tree->root); + entry = llsync_load_ptr(tree->root); if (entry == NULL) { return NULL; @@ -833,7 +833,7 @@ rdxtree_remove_all(struct rdxtree *tree) if (tree->height == 0) { if (tree->root != NULL) { - llsync_assign_ptr(tree->root, NULL); + llsync_store_ptr(tree->root, NULL); } return; |