LVM2 ./WHATS_NEW_DM libdm/datastruct/bitset.c

LVM2 ./WHATS_NEW_DM libdm/datastruct/bitset.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2010-04-19 21:23:02

Modified files:
	.              : WHATS_NEW_DM 
	libdm/datastruct: bitset.c 

Log message:
	Add dm_bit_and. (ejt)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW_DM.diff?cvsroot=lvm2&r1=1.358&r2=1.359
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/datastruct/bitset.c.diff?cvsroot=lvm2&r1=1.8&r2=1.9

--- LVM2/WHATS_NEW_DM	2010/04/19 21:10:20	1.358
+++ LVM2/WHATS_NEW_DM	2010/04/19 21:23:01	1.359
@@ -1,5 +1,6 @@
 Version 1.02.47 -
 =================================
+  Add dm_bit_and.
   Simplify dm_bitset_create.
   Speed up dm_bit_get_next with ffs().
 
--- LVM2/libdm/datastruct/bitset.c	2010/04/19 21:10:20	1.8
+++ LVM2/libdm/datastruct/bitset.c	2010/04/19 21:23:02	1.9
@@ -42,6 +42,13 @@
 	dm_free(bs);
 }
 
+void dm_bit_and(dm_bitset_t out, dm_bitset_t in1, dm_bitset_t in2)
+{
+	int i;
+
+	for (i = (in1[0] / DM_BITS_PER_INT) + 1; i; i--)
+		out[i] = in1[i] & in2[i];
+}
 void dm_bit_union(dm_bitset_t out, dm_bitset_t in1, dm_bitset_t in2)
 {
 	int i;

LVM2 ./WHATS_NEW_DM libdm/datastruct/bitset.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2010-04-19 21:10:20

Modified files:
	.              : WHATS_NEW_DM 
	libdm/datastruct: bitset.c 

Log message:
	fix last commit

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW_DM.diff?cvsroot=lvm2&r1=1.357&r2=1.358
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/datastruct/bitset.c.diff?cvsroot=lvm2&r1=1.7&r2=1.8

--- LVM2/WHATS_NEW_DM	2010/04/19 17:17:55	1.357
+++ LVM2/WHATS_NEW_DM	2010/04/19 21:10:20	1.358
@@ -1,5 +1,6 @@
 Version 1.02.47 -
 =================================
+  Simplify dm_bitset_create.
   Speed up dm_bit_get_next with ffs().
 
 Version 1.02.46 - 14th April 2010
--- LVM2/libdm/datastruct/bitset.c	2010/04/19 21:08:32	1.7
+++ LVM2/libdm/datastruct/bitset.c	2010/04/19 21:10:20	1.8
@@ -27,7 +27,7 @@
 	if (mem)
 		bs = dm_pool_zalloc(mem, size);
 	else if ((bs = dm_malloc(size)))
-		memset(mem, 0, size);
+		memset(bs, 0, size);
 
 	if (!bs)
 		return NULL;

LVM2 ./WHATS_NEW_DM libdm/datastruct/bitset.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2010-04-19 17:17:55

Modified files:
	.              : WHATS_NEW_DM 
	libdm/datastruct: bitset.c 

Log message:
	Speed up dm_bit_get_next with ffs().

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW_DM.diff?cvsroot=lvm2&r1=1.356&r2=1.357
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/datastruct/bitset.c.diff?cvsroot=lvm2&r1=1.5&r2=1.6

--- LVM2/WHATS_NEW_DM	2010/04/14 21:47:48	1.356
+++ LVM2/WHATS_NEW_DM	2010/04/19 17:17:55	1.357
@@ -1,5 +1,6 @@
 Version 1.02.47 -
 =================================
+  Speed up dm_bit_get_next with ffs().
 
 Version 1.02.46 - 14th April 2010
 =================================
--- LVM2/libdm/datastruct/bitset.c	2008/11/03 18:59:59	1.5
+++ LVM2/libdm/datastruct/bitset.c	2010/04/19 17:17:55	1.6
@@ -52,18 +52,11 @@
 		out[i] = in1[i] | in2[i];
 }
 
-/*
- * FIXME: slow
- */
-static inline int _test_word(uint32_t test, int bit)
+static int _test_word(uint32_t test, int bit)
 {
-	while (bit < (int) DM_BITS_PER_INT) {
-		if (test & (0x1 << bit))
-			return bit;
-		bit++;
-	}
+	int next_set_bit;
 
-	return -1;
+	return ((next_set_bit = ffs(test >> bit)) ? next_set_bit + bit - 1 : -1);
 }
 
 int dm_bit_get_next(dm_bitset_t bs, int last_bit)