Page MenuHomeFreeBSD
Files F154261169

D41391.id125757.diff
No OneTemporary
Actions

D41391.id125757.diff
View Options

Index: sys/kern/subr_rangeset.c
===================================================================
--- sys/kern/subr_rangeset.c
+++ sys/kern/subr_rangeset.c
@@ -72,6 +72,9 @@
uma_zfree(rs_node_zone, node);
}
+PCTRIE_DEFINE(RANGESET, rs_el, re_start, rs_node_alloc, rs_node_free);
+
+
void
rangeset_init(struct rangeset *rs, rs_dup_data_t dup_data,
rs_free_data_t free_data, void *data_ctx, u_int alloc_flags)
@@ -96,16 +99,10 @@
rangeset_check_empty(struct rangeset *rs, uint64_t start, uint64_t end)
{
struct rs_el *r;
- uint64_t *r1;
rangeset_check(rs);
- r1 = pctrie_lookup_le(&rs->rs_trie, end);
- if (r1 != NULL) {
- r = __containerof(r1, struct rs_el, re_start);
- if (r->re_end > start)
- return (false);
- }
- return (true);
+ r = RANGESET_PCTRIE_LOOKUP_LE(&rs->rs_trie, end);
+ return (r == NULL || r->re_end <= start);
}
int
@@ -122,7 +119,7 @@
r = data;
r->re_start = start;
r->re_end = end;
- error = pctrie_insert(&rs->rs_trie, &r->re_start, rs_node_alloc);
+ error = RANGESET_PCTRIE_INSERT(&rs->rs_trie, r);
rangeset_check(rs);
return (error);
}
@@ -132,16 +129,14 @@
rs_pred_t pred)
{
struct rs_el *r, *rn;
- uint64_t *r1;
int error;
rangeset_check(rs);
error = 0;
for (; end > 0 && start < end;) {
- r1 = pctrie_lookup_le(&rs->rs_trie, end - 1);
- if (r1 == NULL)
+ r = RANGESET_PCTRIE_LOOKUP_LE(&rs->rs_trie, end - 1);
+ if (r == NULL)
break;
- r = __containerof(r1, struct rs_el, re_start);
/*
* ------============================--|-------|----
@@ -167,8 +162,8 @@
*/
end = r->re_start;
if (pred(rs->rs_data_ctx, r)) {
- pctrie_remove(&rs->rs_trie, r->re_start,
- rs_node_free);
+ RANGESET_PCTRIE_REMOVE(&rs->rs_trie,
+ r->re_start);
rs->rs_free_data(rs->rs_data_ctx, r);
}
continue;
@@ -180,11 +175,10 @@
*/
if (r->re_start >= start) {
if (pred(rs->rs_data_ctx, r)) {
- pctrie_remove(&rs->rs_trie, r->re_start,
- rs_node_free);
+ RANGESET_PCTRIE_REMOVE(&rs->rs_trie,
+ r->re_start);
r->re_start = end;
- error = pctrie_insert(&rs->rs_trie,
- &r->re_start, rs_node_alloc);
+ error = RANGESET_PCTRIE_INSERT(&rs->rs_trie, r);
/*
* The insert above must succeed
* because rs_node zone is marked
@@ -215,8 +209,7 @@
}
rn->re_start = end;
rn->re_end = r->re_end;
- error = pctrie_insert(&rs->rs_trie, &rn->re_start,
- rs_node_alloc);
+ error = RANGESET_PCTRIE_INSERT(&rs->rs_trie, rn);
if (error != 0) {
rs->rs_free_data(rs->rs_data_ctx, rn);
break;
@@ -247,14 +240,12 @@
rangeset_remove_all(struct rangeset *rs)
{
struct rs_el *r;
- uint64_t *r1;
for (;;) {
- r1 = pctrie_lookup_ge(&rs->rs_trie, 0);
- if (r1 == NULL)
+ r = RANGESET_PCTRIE_LOOKUP_GE(&rs->rs_trie, 0);
+ if (r == NULL)
break;
- r = __containerof(r1, struct rs_el, re_start);
- pctrie_remove(&rs->rs_trie, r->re_start, rs_node_free);
+ RANGESET_PCTRIE_REMOVE(&rs->rs_trie, r->re_start);
rs->rs_free_data(rs->rs_data_ctx, r);
}
}
@@ -263,13 +254,11 @@
rangeset_lookup(struct rangeset *rs, uint64_t place)
{
struct rs_el *r;
- uint64_t *r1;
rangeset_check(rs);
- r1 = pctrie_lookup_le(&rs->rs_trie, place);
- if (r1 == NULL)
+ r = RANGESET_PCTRIE_LOOKUP_LE(&rs->rs_trie, place);
+ if (r == NULL)
return (NULL);
- r = __containerof(r1, struct rs_el, re_start);
if (r->re_end <= place)
return (NULL);
return (r);
@@ -279,7 +268,7 @@
rangeset_copy(struct rangeset *dst_rs, struct rangeset *src_rs)
{
struct rs_el *src_r, *dst_r;
- uint64_t cursor, *r1;
+ uint64_t cursor;
int error;
MPASS(pctrie_is_empty(&dst_rs->rs_trie));
@@ -288,17 +277,15 @@
error = 0;
for (cursor = 0;; cursor = src_r->re_start + 1) {
- r1 = pctrie_lookup_ge(&src_rs->rs_trie, cursor);
- if (r1 == NULL)
+ src_r = RANGESET_PCTRIE_LOOKUP_GE(&src_rs->rs_trie, cursor);
+ if (src_r == NULL)
break;
- src_r = __containerof(r1, struct rs_el, re_start);
dst_r = dst_rs->rs_dup_data(dst_rs->rs_data_ctx, src_r);
if (dst_r == NULL) {
error = ENOMEM;
break;
}
- error = pctrie_insert(&dst_rs->rs_trie, &dst_r->re_start,
- rs_node_alloc);
+ error = RANGESET_PCTRIE_INSERT(&dst_rs->rs_trie, dst_r);
if (error != 0)
break;
}
@@ -312,13 +299,12 @@
rangeset_check(struct rangeset *rs)
{
struct rs_el *r, *rp;
- uint64_t cursor, *r1;
+ uint64_t cursor;
for (cursor = 0, rp = NULL;; cursor = r->re_start + 1, rp = r) {
- r1 = pctrie_lookup_ge(&rs->rs_trie, cursor);
- if (r1 == NULL)
+ r = RANGESET_PCTRIE_LOOKUP_GE(&rs->rs_trie, cursor);
+ if (r == NULL)
break;
- r = __containerof(r1, struct rs_el, re_start);
KASSERT(r->re_start < r->re_end,
("invalid interval rs %p elem %p (%#jx, %#jx)",
rs, r, (uintmax_t)r->re_start, (uintmax_t)r->re_end));
@@ -343,7 +329,7 @@
{
struct rangeset *rs;
struct rs_el *r;
- uint64_t cursor, *r1;
+ uint64_t cursor;
if (!have_addr) {
db_printf("show rangeset addr\n");
@@ -353,10 +339,9 @@
rs = (struct rangeset *)addr;
db_printf("rangeset %p\n", rs);
for (cursor = 0;; cursor = r->re_start + 1) {
- r1 = pctrie_lookup_ge(&rs->rs_trie, cursor);
- if (r1 == NULL)
+ r = RANGESET_PCTRIE_LOOKUP_GE(&rs->rs_trie, cursor);
+ if (r == NULL)
break;
- r = __containerof(r1, struct rs_el, re_start);
db_printf(" el %p start %#jx end %#jx\n",
r, r->re_start, r->re_end);
}
Index: sys/sys/pctrie.h
===================================================================
--- sys/sys/pctrie.h
+++ sys/sys/pctrie.h
@@ -83,7 +83,7 @@
allocfn); \
} \
\
-static __inline struct type * \
+static __inline __unused struct type * \
name##_PCTRIE_LOOKUP(struct pctrie *ptree, uint64_t key) \
{ \
\

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 28, 11:23 AM (15 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32273084
Default Alt Text
D41391.id125757.diff (5 KB)

Event Timeline