Skip to contentSkip to conversation

uintset: add l_uintset_count

PATCH New James Prestwood 1 participant 2 messages Nov 30, 2021

lore
Share & tools
lore

James Prestwood

author
#0 lore raw

PATCH 1/2 uintset: add l_uintset_count

This counts the number of true bits in a set.

---
 ell/ell.sym   |  1 +
 ell/uintset.c | 26 ++++++++++++++++++++++++++
 ell/uintset.h |  1 +
 3 files changed, 28 insertions(+)
ell/ell.sym +1 -0
index d9b48ee..cb6eadf 100644
@@ -530,6 +530,7 @@ global:
 	l_uintset_clone;
 	l_uintset_intersect;
 	l_uintset_isempty;
+	l_uintset_count;
 	/* uuid */
 	l_uuid_v3;
 	l_uuid_v4;
ell/uintset.c +26 -0
index 74de420..693f58c 100644
@@ -555,3 +555,29 @@ LIB_EXPORT bool l_uintset_isempty(const struct l_uintset *set)
 
 	return true;
 }
+
+
+#include <ell/ell.h>
+/**
+ * l_uintset_count
+ *
+ * @set: The set of numbers
+ *
+ * Returns the number of true bits in the set.
+ */
+LIB_EXPORT uint32_t l_uintset_count(const struct l_uintset *set)
+{
+	uint16_t i;
+	uint32_t offset_max;
+	uint32_t count = 0;
+
+	if (unlikely(!set))
+		return 0;
+
+	offset_max = (set->size + BITS_PER_LONG - 1) / BITS_PER_LONG;
+
+	for (i = 0; i < offset_max; i++)
+		count += __builtin_popcountl(set->bits[i]);
+
+	return count;
+}
ell/uintset.h +1 -0
index 07ed778..79f3358 100644
@@ -61,6 +61,7 @@ struct l_uintset *l_uintset_clone(const struct l_uintset *original);
 struct l_uintset *l_uintset_intersect(const struct l_uintset *set_a,
 						const struct l_uintset *set_b);
 bool l_uintset_isempty(const struct l_uintset *set);
+uint32_t l_uintset_count(const struct l_uintset *set);
 
 #ifdef __cplusplus
 }
Signature · 1 line
2.31.1
author
#1 lore raw

PATCH 2/2 unit: add test for l_uintset_count

---
 unit/test-uintset.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
unit/test-uintset.c +24 -0
index 3c9790e..6afa7a8 100644
@@ -363,6 +363,29 @@ static void test_uintset_isempty(const void *user_data)
 	l_uintset_free(b);
 }
 
+static void test_uintset_count(const void *user_data)
+{
+	uint32_t i;
+	struct l_uintset *set = l_uintset_new(32);
+
+	assert(l_uintset_count(set) == 0);
+
+	for (i = 0; i < 32; i++) {
+		l_uintset_put(set, i);
+		assert(l_uintset_count(set) == i);
+	}
+
+	assert(l_uintset_count(set) == i - 1);
+
+	l_uintset_take(set, 10);
+	assert(l_uintset_count(set) == i - 2);
+
+	for (i = 0; i < 32; i++)
+		l_uintset_take(set, i);
+
+	assert(l_uintset_count(set) == 0);
+}
+
 int main(int argc, char *argv[])
 {
 	l_test_init(&argc, &argv);
@@ -381,6 +404,7 @@ int main(int argc, char *argv[])
 	l_test_add("l_uintset intersect test 2", test_uintset_intersect_test,
 							&intersect_data_2);
 	l_test_add("l_uintset isempty", test_uintset_isempty, NULL);
+	l_test_add("l_uintset count", test_uintset_count, NULL);
 
 	return l_test_run();
 }
Signature · 1 line
2.31.1