Page MenuHomeFreeBSD
Files F151298083

D49015.id151058.diff
No OneTemporary
Actions

D49015.id151058.diff
View Options

Index: sys/kern/subr_pctrie.c
===================================================================
--- sys/kern/subr_pctrie.c
+++ sys/kern/subr_pctrie.c
@@ -831,21 +831,18 @@
* internal node with only one child, purge it from the pctrie and save it in
* *freenode for later disposal.
*/
-static uint64_t *
+static void
pctrie_remove(struct pctrie *ptree, struct pctrie_node *node, uint64_t index,
- struct pctrie_node *child, struct pctrie_node **freenode)
+ struct pctrie_node **freenode)
{
- uint64_t *m;
+ struct pctrie_node *child;
int slot;
*freenode = NULL;
- m = pctrie_match_value(child, index);
- if (m == NULL)
- return (m);
if (node == NULL) {
pctrie_node_store(pctrie_root(ptree),
PCTRIE_NULL, PCTRIE_LOCKED);
- return (m);
+ return;
}
slot = pctrie_slot(node, index);
KASSERT((node->pn_popmap & (1 << slot)) != 0,
@@ -854,7 +851,7 @@
node->pn_popmap ^= 1 << slot;
pctrie_node_store(&node->pn_child[slot], PCTRIE_NULL, PCTRIE_LOCKED);
if (!powerof2(node->pn_popmap))
- return (m);
+ return;
KASSERT(node->pn_popmap != 0, ("%s: bad popmap all zeroes", __func__));
slot = ffs(node->pn_popmap) - 1;
child = pctrie_node_load(&node->pn_child[slot], NULL, PCTRIE_LOCKED);
@@ -866,7 +863,6 @@
pctrie_setparent(child, node);
pctrie_node_store(pctrie_child(ptree, node, index), child,
PCTRIE_LOCKED);
- return (m);
}
/*
@@ -878,6 +874,7 @@
struct pctrie_node **freenode)
{
struct pctrie_node *child, *node;
+ uint64_t *m;
int slot;
node = NULL;
@@ -888,25 +885,26 @@
child = pctrie_node_load(&node->pn_child[slot], NULL,
PCTRIE_LOCKED);
}
- return (pctrie_remove(ptree, node, index, child, freenode));
+ if ((m = pctrie_match_value(child, index)) != NULL)
+ pctrie_remove(ptree, node, index, freenode);
+ else
+ *freenode = NULL;
+ return (m);
}
/*
* Remove from the trie the leaf last chosen by the iterator, and
* adjust the path if it's last member is to be freed.
*/
-uint64_t *
+void
pctrie_iter_remove(struct pctrie_iter *it, struct pctrie_node **freenode)
{
- struct pctrie_node *child;
- uint64_t *m;
-
- child = pctrie_node_load(pctrie_child(it->ptree, it->node, it->index),
- NULL, PCTRIE_LOCKED);
- m = pctrie_remove(it->ptree, it->node, it->index, child, freenode);
+ KASSERT(NULL != pctrie_match_value(pctrie_node_load(pctrie_child(
+ it->ptree, it->node, it->index), NULL, PCTRIE_LOCKED), it->index),
+ ("%s: removing value %lx not at iter", __func__, it->index));
+ pctrie_remove(it->ptree, it->node, it->index, freenode);
if (*freenode != NULL)
it->node = pctrie_parent(it->node);
- return (m);
}
/*
Index: sys/sys/pctrie.h
===================================================================
--- sys/sys/pctrie.h
+++ sys/sys/pctrie.h
@@ -312,12 +312,9 @@
static __inline __unused void \
name##_PCTRIE_ITER_REMOVE(struct pctrie_iter *it) \
{ \
- uint64_t *val; \
struct pctrie_node *freenode; \
\
- val = pctrie_iter_remove(it, &freenode); \
- if (val == NULL) \
- panic("%s: key not found", __func__); \
+ pctrie_iter_remove(it, &freenode); \
name##_PCTRIE_REMOVE_BASE(it->ptree, freenode); \
} \
\
@@ -386,7 +383,7 @@
pctrie_cb_t callback, int keyoff, void *arg);
uint64_t *pctrie_remove_lookup(struct pctrie *ptree, uint64_t index,
struct pctrie_node **killnode);
-uint64_t *pctrie_iter_remove(struct pctrie_iter *it,
+void pctrie_iter_remove(struct pctrie_iter *it,
struct pctrie_node **freenode);
uint64_t *pctrie_iter_value(struct pctrie_iter *it);
uint64_t *pctrie_replace(struct pctrie *ptree, uint64_t *newval);

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 8, 10:08 AM (14 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31093854
Default Alt Text
D49015.id151058.diff (3 KB)

Event Timeline