bitmap: New function bitmap_scan() and macro BITMAP_FOR_EACH_1.

bitmap_scan() can be optimized significantly for the case of a sparse
bitmap but it doesn't seem worth the additional overhead of writing a test
unless and until we show that it's a useful optimization in practice.

diff --git a/lib/bitmap.c b/lib/bitmap.c
index f021a7e585fcb595f29c4a6018ec9b9343bb07a9..df3c4ebca38b4c125e87228acfe4557e0c20a9bf 100644 (file)
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008 Nicira Networks.
+ * Copyright (c) 2008, 2009 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,3 +53,20 @@ bitmap_equal(const unsigned long *a, const unsigned long *b, size_t n)
     }
     return true;
 }
+
+/* Scans 'bitmap' from bit offset 'start' to 'end', excluding 'end' itself.
+ * Returns the bit offset of the lowest-numbered bit set to 1, or 'end' if
+ * all of the bits are set to 0. */
+size_t
+bitmap_scan(const unsigned long int *bitmap, size_t start, size_t end)
+{
+    /* XXX slow */
+    size_t i;
+
+    for (i = start; i < end; i++) {
+        if (bitmap_is_set(bitmap, i)) {
+            break;
+        }
+    }
+    return i;
+}

diff --git a/lib/bitmap.h b/lib/bitmap.h
index 204281030e2b8e7a04a275084d047692789188fc..5b50c9cc4987aa3e840d62550e303888ce7770ba 100644 (file)
--- a/lib/bitmap.h
+++ b/lib/bitmap.h
@@ -79,5 +79,10 @@ bitmap_set(unsigned long *bitmap, size_t offset, bool value)
 void bitmap_set_multiple(unsigned long *, size_t start, size_t count,
                          bool value);
 bool bitmap_equal(const unsigned long *, const unsigned long *, size_t n);
+size_t bitmap_scan(const unsigned long int *, size_t start, size_t end);
+
+#define BITMAP_FOR_EACH_1(IDX, SIZE, BITMAP) \
+    for ((IDX) = bitmap_scan(BITMAP, 0, SIZE); (IDX) < (SIZE); \
+         (IDX) = bitmap_scan(BITMAP, (IDX) + 1, SIZE))
 
 #endif /* bitmap.h */