X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fbitmap.c;h=51ad5bf919eaa2bb39e46704bbfe1dee658da6cd;hb=8a4e3a858ae1feef4098837414665aa525f2d1e5;hp=df3c4ebca38b4c125e87228acfe4557e0c20a9bf;hpb=a4af00400a835eb87569ba40e21874c05e872c0f;p=sliver-openvswitch.git

diff --git a/lib/bitmap.c b/lib/bitmap.c
index df3c4ebca..51ad5bf91 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2011 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,29 @@
 #include <config.h>
 #include "bitmap.h"
 #include <string.h>
+#include "util.h"
+
+/* Allocates and returns a bitmap initialized to all-1-bits. */
+unsigned long *
+bitmap_allocate1(size_t n_bits)
+{
+    size_t n_bytes = bitmap_n_bytes(n_bits);
+    size_t n_longs = bitmap_n_longs(n_bits);
+    size_t r_bits = n_bits % BITMAP_ULONG_BITS;
+    unsigned long *bitmap;
+
+    /* Allocate and initialize most of the bitmap. */
+    bitmap = xmalloc(n_bytes);
+    memset(bitmap, 0xff, n_bytes);
+
+    /* Ensure that the last "unsigned long" in the bitmap only has as many
+     * 1-bits as there actually should be. */
+    if (r_bits) {
+        bitmap[n_longs - 1] = (1UL << r_bits) - 1;
+    }
+
+    return bitmap;
+}
 
 /* Sets 'count' consecutive bits in 'bitmap', starting at bit offset 'start',
  * to 'value'. */
@@ -70,3 +93,18 @@ bitmap_scan(const unsigned long int *bitmap, size_t start, size_t end)
     }
     return i;
 }
+
+/* Returns the number of 1-bits in the 'n'-bit bitmap at 'bitmap'. */
+size_t
+bitmap_count1(const unsigned long int *bitmap, size_t n)
+{
+    size_t i;
+    size_t count = 0;
+
+    BUILD_ASSERT(ULONG_MAX <= UINT64_MAX);
+    for (i = 0; i < BITMAP_N_LONGS(n); i++) {
+        count += count_1bits(bitmap[i]);
+    }
+
+    return count;
+}