git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto-dpif: Use sequence number to wake up main thread for
[sliver-openvswitch.git]
/
lib
/
bitmap.h
diff --git
a/lib/bitmap.h
b/lib/bitmap.h
index
f6feff0
..
afe6151
100644
(file)
--- a/
lib/bitmap.h
+++ b/
lib/bitmap.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011
Nicira Networks
.
+ * Copyright (c) 2008, 2009, 2010, 2011
, 2012, 2013, 2014 Nicira, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-26,7
+26,7
@@
static inline unsigned long *
bitmap_unit__(const unsigned long *bitmap, size_t offset)
{
static inline unsigned long *
bitmap_unit__(const unsigned long *bitmap, size_t offset)
{
- return
(unsigned long *) &bitmap[offset / BITMAP_ULONG_BITS]
;
+ return
CONST_CAST(unsigned long *, &bitmap[offset / BITMAP_ULONG_BITS])
;
}
static inline unsigned long
}
static inline unsigned long
@@
-35,10
+35,12
@@
bitmap_bit__(size_t offset)
return 1UL << (offset % BITMAP_ULONG_BITS);
}
return 1UL << (offset % BITMAP_ULONG_BITS);
}
+#define BITMAP_N_LONGS(N_BITS) DIV_ROUND_UP(N_BITS, BITMAP_ULONG_BITS)
+
static inline size_t
bitmap_n_longs(size_t n_bits)
{
static inline size_t
bitmap_n_longs(size_t n_bits)
{
- return
DIV_ROUND_UP(n_bits, BITMAP_ULONG_BITS
);
+ return
BITMAP_N_LONGS(n_bits
);
}
static inline size_t
}
static inline size_t
@@
-53,6
+55,8
@@
bitmap_allocate(size_t n_bits)
return xzalloc(bitmap_n_bytes(n_bits));
}
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)
{
static inline unsigned long *
bitmap_clone(const unsigned long *bitmap, size_t n_bits)
{
@@
-96,10
+100,12
@@
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);
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);
+size_t bitmap_scan(const unsigned long int *, bool target,
+ size_t start, size_t end);
+size_t bitmap_count1(const unsigned long *, size_t n);
#define BITMAP_FOR_EACH_1(IDX, SIZE, BITMAP) \
#define BITMAP_FOR_EACH_1(IDX, SIZE, BITMAP) \
- for ((IDX) = bitmap_scan(BITMAP,
0, SIZE); (IDX) < (SIZE);
\
- (IDX) = bitmap_scan(BITMAP, (IDX) + 1, SIZE))
+ for ((IDX) = bitmap_scan(BITMAP,
1, 0, SIZE); (IDX) < (SIZE);
\
+ (IDX) = bitmap_scan(BITMAP,
1,
(IDX) + 1, SIZE))
#endif /* bitmap.h */
#endif /* bitmap.h */