git: c0360504add5 - stable/13 - unr(9): add iterator interface
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 05 Jun 2023 08:36:07 UTC
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=c0360504add56d422bb8f77ec7f7a32689a2e8b1
commit c0360504add56d422bb8f77ec7f7a32689a2e8b1
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-05-12 22:49:29 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-06-05 08:35:01 +0000
unr(9): add iterator interface
(cherry picked from commit a014e0a3987a277a0e56c7fa5b9d895f735a8d1e)
---
sys/kern/subr_unit.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++
sys/sys/systm.h | 3 ++
2 files changed, 124 insertions(+)
diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c
index 0f4d25257553..ee67e5db01d6 100644
--- a/sys/kern/subr_unit.c
+++ b/sys/kern/subr_unit.c
@@ -238,6 +238,122 @@ ub_full(struct unrb *ub, int len)
return (first_clear == -1);
}
+/*
+ * start: ipos = -1, upos = NULL;
+ * end: ipos = -1, upos = uh
+ */
+struct unrhdr_iter {
+ struct unrhdr *uh;
+ int ipos;
+ int upos_first_item;
+ void *upos;
+};
+
+void *
+create_iter_unr(struct unrhdr *uh)
+{
+ struct unrhdr_iter *iter;
+
+ iter = Malloc(sizeof(*iter));
+ iter->ipos = -1;
+ iter->uh = uh;
+ iter->upos = NULL;
+ iter->upos_first_item = -1;
+ return (iter);
+}
+
+static void
+next_iter_unrl(struct unrhdr *uh, struct unrhdr_iter *iter)
+{
+ struct unr *up;
+ struct unrb *ub;
+ u_int y;
+ int c;
+
+ if (iter->ipos == -1) {
+ if (iter->upos == uh)
+ return;
+ y = uh->low - 1;
+ if (uh->first == 0) {
+ up = TAILQ_FIRST(&uh->head);
+ if (up == NULL) {
+ iter->upos = uh;
+ return;
+ }
+ iter->upos = up;
+ if (up->ptr == NULL)
+ iter->upos = NULL;
+ else
+ iter->upos_first_item = uh->low;
+ }
+ } else {
+ y = iter->ipos;
+ }
+
+ up = iter->upos;
+
+ /* Special case for the compacted [low, first) run. */
+ if (up == NULL) {
+ if (y + 1 < uh->low + uh->first) {
+ iter->ipos = y + 1;
+ return;
+ }
+ up = iter->upos = TAILQ_FIRST(&uh->head);
+ iter->upos_first_item = uh->low + uh->first;
+ }
+
+ for (;;) {
+ if (y + 1 < iter->upos_first_item + up->len) {
+ if (up->ptr == uh) {
+ iter->ipos = y + 1;
+ return;
+ } else if (is_bitmap(uh, up)) {
+ ub = up->ptr;
+ bit_ffs_at(&ub->map[0],
+ y + 1 - iter->upos_first_item,
+ up->len, &c);
+ if (c != -1) {
+ iter->ipos = iter->upos_first_item + c;
+ return;
+ }
+ }
+ }
+ iter->upos_first_item += up->len;
+ y = iter->upos_first_item - 1;
+ up = iter->upos = TAILQ_NEXT((struct unr *)iter->upos, list);
+ if (iter->upos == NULL) {
+ iter->ipos = -1;
+ iter->upos = uh;
+ return;
+ }
+ }
+}
+
+/*
+ * returns -1 on end, otherwise the next element
+ */
+int
+next_iter_unr(void *handle)
+{
+ struct unrhdr *uh;
+ struct unrhdr_iter *iter;
+
+ iter = handle;
+ uh = iter->uh;
+ if (uh->mtx != NULL)
+ mtx_lock(uh->mtx);
+ next_iter_unrl(uh, iter);
+ if (uh->mtx != NULL)
+ mtx_unlock(uh->mtx);
+ return (iter->ipos);
+}
+
+void
+free_iter_unr(void *handle)
+{
+ Free(handle);
+}
+
#if defined(DIAGNOSTIC) || !defined(_KERNEL)
/*
* Consistency check function.
@@ -1056,6 +1172,11 @@ test_alloc_unr_specific(struct unrhdr *uh, u_int i, char a[])
}
}
+static void
+test_iter(void)
+{
+}
+
static void
usage(char **argv)
{
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 828297e5b948..4b479e95aa2f 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -483,6 +483,9 @@ int alloc_unr(struct unrhdr *uh);
int alloc_unr_specific(struct unrhdr *uh, u_int item);
int alloc_unrl(struct unrhdr *uh);
void free_unr(struct unrhdr *uh, u_int item);
+void *create_iter_unr(struct unrhdr *uh);
+int next_iter_unr(void *handle);
+void free_iter_unr(void *handle);
#ifndef __LP64__
#define UNR64_LOCKED