X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fbitmap.h;h=47b77e7326aed77d6e9f0ade5cff446461ca7135;hb=e615b0a347057f9af7e93922acd4ae794ac87015;hp=5b50c9cc4987aa3e840d62550e303888ce7770ba;hpb=02dd3123a0e312f1d33403e744af52dd6096f12d;p=openvswitch diff --git a/lib/bitmap.h b/lib/bitmap.h index 5b50c9cc..47b77e73 100644 --- a/lib/bitmap.h +++ b/lib/bitmap.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 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. @@ -35,11 +35,30 @@ bitmap_bit__(size_t offset) return 1UL << (offset % BITMAP_ULONG_BITS); } +static inline size_t +bitmap_n_longs(size_t n_bits) +{ + return DIV_ROUND_UP(n_bits, BITMAP_ULONG_BITS); +} + +static inline size_t +bitmap_n_bytes(size_t n_bits) +{ + return bitmap_n_longs(n_bits) * sizeof(unsigned long int); +} + static inline unsigned long * bitmap_allocate(size_t n_bits) { - size_t n_longs = DIV_ROUND_UP(n_bits, BITMAP_ULONG_BITS); - return xcalloc(sizeof(unsigned long int), n_longs); + return xzalloc(bitmap_n_bytes(n_bits)); +} + +unsigned long *bitmap_allocate1(size_t n_bits); + +static inline unsigned long * +bitmap_clone(const unsigned long *bitmap, size_t n_bits) +{ + return xmemdup(bitmap, bitmap_n_bytes(n_bits)); } static inline void