From: "Christian Göttsche" <cgzones@googlemail.com>
To: selinux@vger.kernel.org
Subject: [PATCH 5/7] libsepol: optimize ebitmap_and
Date: Tue, 12 Jul 2022 18:08:56 +0200 [thread overview]
Message-ID: <20220712160858.22677-5-cgzones@googlemail.com> (raw)
In-Reply-To: <20220712160858.22677-1-cgzones@googlemail.com>
Iterate on nodes instead of single bits to save node resolution for each
single bit.
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
libsepol/src/ebitmap.c | 42 +++++++++++++++++++++++++++++++++++-------
1 file changed, 35 insertions(+), 7 deletions(-)
diff --git a/libsepol/src/ebitmap.c b/libsepol/src/ebitmap.c
index 6a63e559..c3d706e9 100644
--- a/libsepol/src/ebitmap.c
+++ b/libsepol/src/ebitmap.c
@@ -74,15 +74,43 @@ int ebitmap_union(ebitmap_t * dst, const ebitmap_t * e1)
int ebitmap_and(ebitmap_t *dst, const ebitmap_t *e1, const ebitmap_t *e2)
{
- unsigned int i, length = min(ebitmap_length(e1), ebitmap_length(e2));
+ const ebitmap_node_t *n1, *n2;
+ ebitmap_node_t *new, *prev = NULL;
+
ebitmap_init(dst);
- for (i=0; i < length; i++) {
- if (ebitmap_get_bit(e1, i) && ebitmap_get_bit(e2, i)) {
- int rc = ebitmap_set_bit(dst, i, 1);
- if (rc < 0)
- return rc;
- }
+
+ n1 = e1->node;
+ n2 = e2->node;
+ while (n1 && n2) {
+ if (n1->startbit == n2->startbit) {
+ if (n1->map & n2->map) {
+ new = malloc(sizeof(ebitmap_node_t));
+ if (!new) {
+ ebitmap_destroy(dst);
+ return -ENOMEM;
+ }
+ new->startbit = n1->startbit;
+ new->map = n1->map & n2->map;
+ new->next = NULL;
+
+ if (prev)
+ prev->next = new;
+ else
+ dst->node = new;
+ prev = new;
+ }
+
+ n1 = n1->next;
+ n2 = n2->next;
+ } else if (n1->startbit > n2->startbit)
+ n2 = n2->next;
+ else
+ n1 = n1->next;
}
+
+ if (prev)
+ dst->highbit = prev->startbit + MAPSIZE;
+
return 0;
}
--
2.36.1
next prev parent reply other threads:[~2022-07-12 16:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-12 16:08 [PATCH 1/7] libsepol/tests: add ebitmap tests Christian Göttsche
2022-07-12 16:08 ` [PATCH 2/7] libsepol: add ebitmap_init_range Christian Göttsche
2022-07-18 20:43 ` James Carter
2022-07-12 16:08 ` [PATCH 3/7] libsepol/cil: use ebitmap_init_range Christian Göttsche
2022-07-18 20:44 ` James Carter
2022-07-12 16:08 ` [PATCH 4/7] libsepol: optimize ebitmap_not Christian Göttsche
2022-07-18 20:46 ` James Carter
2022-07-12 16:08 ` Christian Göttsche [this message]
2022-07-18 20:47 ` [PATCH 5/7] libsepol: optimize ebitmap_and James Carter
2022-07-12 16:08 ` [PATCH 6/7] libsepol: optimize ebitmap_xor Christian Göttsche
2022-07-18 20:48 ` James Carter
2022-07-12 16:08 ` [PATCH 7/7] libsepol: skip superfluous memset calls in ebitmap operations Christian Göttsche
2022-07-18 20:48 ` James Carter
2022-07-18 20:39 ` [PATCH 1/7] libsepol/tests: add ebitmap tests James Carter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220712160858.22677-5-cgzones@googlemail.com \
--to=cgzones@googlemail.com \
--cc=selinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).