/*
- * Copyright (c) 2008, 2009, 2011 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.
#include <config.h>
#include "bitmap.h"
#include <string.h>
+#include "util.h"
/* Allocates and returns a bitmap initialized to all-1-bits. */
unsigned long *
{
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. */
/* Ensure that the last "unsigned long" in the bitmap only has as many
* 1-bits as there actually should be. */
- bitmap[n_longs - 1] = (1UL << (n_bits % BITMAP_ULONG_BITS)) - 1;
+ if (r_bits) {
+ bitmap[n_longs - 1] = (1UL << r_bits) - 1;
+ }
return bitmap;
}
}
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;
+}