X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fbitmap.h;h=5b50c9cc4987aa3e840d62550e303888ce7770ba;hb=1e86ae6f51bcc91d2fa36e4154bc6e540251eaf8;hp=9c420eb64d23719ea8260ed7b6a737ff6108bec9;hpb=a14bc59fb8f27db193d74662dc9c5cb8237177ef;p=openvswitch diff --git a/lib/bitmap.h b/lib/bitmap.h index 9c420eb6..5b50c9cc 100644 --- a/lib/bitmap.h +++ b/lib/bitmap.h @@ -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. @@ -38,7 +38,8 @@ bitmap_bit__(size_t offset) static inline unsigned long * bitmap_allocate(size_t n_bits) { - return xcalloc(1, ROUND_UP(n_bits, BITMAP_ULONG_BITS)); + size_t n_longs = DIV_ROUND_UP(n_bits, BITMAP_ULONG_BITS); + return xcalloc(sizeof(unsigned long int), n_longs); } static inline void @@ -78,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 */