hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-22 03:04:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

pctrie: breakup pctrie_root_store

Browse Source 
Break up pctrie_root_store into the part that casts the root to a
smr_pctnode_t *, and the rest. The rest is just pctrie_node_store, and
the casting part can be used in a few more places.

This is strictly a code-cleanup change, with no functional change
expected.

Reviewed by:	bnovkov
Differential Revision:	https://reviews.freebsd.org/D47347
This commit is contained in:
Doug Moore 2024-11-04 13:23:40 -06:00
parent 930654318e
commit a905c589be
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sys/kern/subr_pctrie.c
View File

@ -167,23 +167,22 @@ pctrie_node_store(smr_pctnode_t *p, void *v, enum pctrie_access access)
} }
} }
/*
* Get the root address, cast to proper type for load/store.
*/
static __inline smr_pctnode_t *
pctrie_root(struct pctrie *ptree)
{
return ((smr_pctnode_t *)&ptree->pt_root);
}
/* /*
* Get the root node for a tree. * Get the root node for a tree.
*/ */
static __inline struct pctrie_node * static __inline struct pctrie_node *
pctrie_root_load(struct pctrie *ptree, smr_t smr, enum pctrie_access access) pctrie_root_load(struct pctrie *ptree, smr_t smr, enum pctrie_access access)
{ {
return (pctrie_node_load((smr_pctnode_t *)&ptree->pt_root, smr, access)); return (pctrie_node_load(pctrie_root(ptree), smr, access));
}
/*
* Set the root node for a tree.
*/
static __inline void
pctrie_root_store(struct pctrie *ptree, struct pctrie_node *node,
enum pctrie_access access)
{
pctrie_node_store((smr_pctnode_t *)&ptree->pt_root, node, access);
} }
/* /*
@ -304,7 +303,7 @@ pctrie_insert_lookup_compound(struct pctrie *ptree, uint64_t *val,
if (pctrie_isleaf(node)) { if (pctrie_isleaf(node)) {
if (node == PCTRIE_NULL) { if (node == PCTRIE_NULL) {
if (parent == NULL) if (parent == NULL)
pctrie_root_store(ptree, pctrie_node_store(pctrie_root(ptree),
pctrie_toleaf(val), PCTRIE_LOCKED); pctrie_toleaf(val), PCTRIE_LOCKED);
else else
pctrie_addnode(parent, index, pctrie_addnode(parent, index,
@ -354,8 +353,7 @@ pctrie_insert_lookup_compound(struct pctrie *ptree, uint64_t *val,
* children 'node' and 'val'. Return the place that points to 'node' * children 'node' and 'val'. Return the place that points to 'node'
* now, and will point to to the new branching node later. * now, and will point to to the new branching node later.
*/ */
return ((parent != NULL) ? &parent->pn_child[slot]: return ((parent == NULL) ? pctrie_root(ptree): &parent->pn_child[slot]);
(smr_pctnode_t *)&ptree->pt_root);
} }
/* /*
@ -608,7 +606,7 @@ pctrie_iter_insert_lookup(struct pctrie_iter *it, uint64_t *val)
node = _pctrie_iter_lookup_node(it, *val, NULL, PCTRIE_LOCKED); node = _pctrie_iter_lookup_node(it, *val, NULL, PCTRIE_LOCKED);
if (node == PCTRIE_NULL) { if (node == PCTRIE_NULL) {
if (it->top == 0) if (it->top == 0)
pctrie_root_store(it->ptree, pctrie_node_store(pctrie_root(it->ptree),
pctrie_toleaf(val), PCTRIE_LOCKED); pctrie_toleaf(val), PCTRIE_LOCKED);
else else
pctrie_addnode(it->path[it->top - 1], it->index, pctrie_addnode(it->path[it->top - 1], it->index,
@ -625,7 +623,7 @@ pctrie_iter_insert_lookup(struct pctrie_iter *it, uint64_t *val)
* now, and will point to to the new branching node later. * now, and will point to to the new branching node later.
*/ */
if (it->top == 0) if (it->top == 0)
return ((smr_pctnode_t *)&it->ptree->pt_root); return (pctrie_root(it->ptree));
node = it->path[it->top - 1]; node = it->path[it->top - 1];
return (&node->pn_child[pctrie_slot(node, it->index)]); return (&node->pn_child[pctrie_slot(node, it->index)]);
} }
@ -1037,7 +1035,8 @@ pctrie_remove(struct pctrie *ptree, uint64_t index, struct pctrie_node *parent,
int slot; int slot;
if (node == NULL) { if (node == NULL) {
pctrie_root_store(ptree, PCTRIE_NULL, PCTRIE_LOCKED); pctrie_node_store(pctrie_root(ptree),
PCTRIE_NULL, PCTRIE_LOCKED);
return; return;
} }
slot = pctrie_slot(node, index); slot = pctrie_slot(node, index);
@ -1054,7 +1053,7 @@ pctrie_remove(struct pctrie *ptree, uint64_t index, struct pctrie_node *parent,
KASSERT(child != PCTRIE_NULL, KASSERT(child != PCTRIE_NULL,
("%s: bad popmap slot %d in node %p", __func__, slot, node)); ("%s: bad popmap slot %d in node %p", __func__, slot, node));
if (parent == NULL) if (parent == NULL)
pctrie_root_store(ptree, child, PCTRIE_LOCKED); pctrie_node_store(pctrie_root(ptree), child, PCTRIE_LOCKED);
else { else {
slot = pctrie_slot(parent, index); slot = pctrie_slot(parent, index);
KASSERT(node == KASSERT(node ==
@ -1218,7 +1217,7 @@ pctrie_reclaim_begin_compound(struct pctrie_node **pnode,
struct pctrie_node *node; struct pctrie_node *node;
node = pctrie_root_load(ptree, NULL, PCTRIE_UNSERIALIZED); node = pctrie_root_load(ptree, NULL, PCTRIE_UNSERIALIZED);
pctrie_root_store(ptree, PCTRIE_NULL, PCTRIE_UNSERIALIZED); pctrie_node_store(pctrie_root(ptree), PCTRIE_NULL, PCTRIE_UNSERIALIZED);
if (pctrie_isleaf(node)) { if (pctrie_isleaf(node)) {
if (callback != NULL && node != PCTRIE_NULL) if (callback != NULL && node != PCTRIE_NULL)
callback(pctrie_toptr(node, keyoff), arg); callback(pctrie_toptr(node, keyoff), arg);
@ -1275,7 +1274,7 @@ pctrie_replace(struct pctrie *ptree, uint64_t *newval)
if (pctrie_isleaf(node)) { if (pctrie_isleaf(node)) {
if ((m = pctrie_toval(node)) != NULL && *m == index) { if ((m = pctrie_toval(node)) != NULL && *m == index) {
if (parent == NULL) if (parent == NULL)
pctrie_root_store(ptree, pctrie_node_store(pctrie_root(ptree),
leaf, PCTRIE_LOCKED); leaf, PCTRIE_LOCKED);
else else
pctrie_node_store( pctrie_node_store(