tequilaOS/platform_external_selinux
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libsepol: optimize ebitmap_and

Browse source 
Iterate on nodes instead of single bits to save node resolution for each
single bit.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
Acked-by: James Carter <jwcart2@gmail.com>
This commit is contained in:
Christian Göttsche 2022-07-19 17:30:42 +02:00 committed by James Carter
parent 12a8a00bf2
commit efcd008148
1 changed files with 35 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
libsepol/src/ebitmap.c
View file

@ -74,15 +74,44 @@ int ebitmap_union(ebitmap_t * dst, const ebitmap_t * e1)
int ebitmap_and(ebitmap_t *dst, const ebitmap_t *e1, const ebitmap_t *e2) 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); ebitmap_init(dst);
for (i=0; i < length; i++) {
if (ebitmap_get_bit(e1, i) && ebitmap_get_bit(e2, i)) { n1 = e1->node;
int rc = ebitmap_set_bit(dst, i, 1); n2 = e2->node;
if (rc < 0) while (n1 && n2) {
return rc; 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; return 0;
} }