Changes in kernel/generic/include/adt/bitmap.h [f72906c:86733f3] in mainline

File:

• kernel/generic/include/adt/bitmap.h (modified) (3 diffs)

kernel/generic/include/adt/bitmap.h

@@ -44 +44 @@
         size_t elements;
         uint8_t *bits;
-        size_t next_fit;
+        
+        size_t block_size;
+        uint8_t *blocks;
 } bitmap_t;
 
@@ -50 +52 @@
     unsigned int value)
 {
-        if (element >= bitmap->elements)
-                return;
-        
-        size_t byte = element / BITMAP_ELEMENT;
-        uint8_t mask = 1 << (element & BITMAP_REMAINER);
-        
-        if (value) {
-                bitmap->bits[byte] |= mask;
-        } else {
-                bitmap->bits[byte] &= ~mask;
-                bitmap->next_fit = byte;
+        if (element < bitmap->elements) {
+                /*
+                 * The 2nd level bitmap is conservative.
+                 * Make sure we update it properly.
+                 */
+                
+                if (value) {
+                        bitmap->bits[element / BITMAP_ELEMENT] |=
+                            (1 << (element & BITMAP_REMAINER));
+                } else {
+                        bitmap->bits[element / BITMAP_ELEMENT] &=
+                            ~(1 << (element & BITMAP_REMAINER));
+                        
+                        if (bitmap->block_size > 0) {
+                                size_t block = element / bitmap->block_size;
+                                
+                                bitmap->blocks[block / BITMAP_ELEMENT] &=
+                                    ~(1 << (block & BITMAP_REMAINER));
+                        }
+                }
         }
 }
@@ -69 +80 @@
                 return 0;
         
-        size_t byte = element / BITMAP_ELEMENT;
-        uint8_t mask = 1 << (element & BITMAP_REMAINER);
-        
-        return !!((bitmap->bits)[byte] & mask);
+        return !!((bitmap->bits)[element / BITMAP_ELEMENT] &
+            (1 << (element & BITMAP_REMAINER)));
 }
 
-extern size_t bitmap_size(size_t);
-extern void bitmap_initialize(bitmap_t *, size_t, void *);
+extern size_t bitmap_size(size_t, size_t);
+extern void bitmap_initialize(bitmap_t *, size_t, size_t, void *);
 
 extern void bitmap_set_range(bitmap_t *, size_t, size_t);
 extern void bitmap_clear_range(bitmap_t *, size_t, size_t);
 
-extern int bitmap_allocate_range(bitmap_t *, size_t, size_t, size_t, size_t,
-    size_t *);
+extern int bitmap_allocate_range(bitmap_t *, size_t, size_t, size_t, size_t *);
+extern void bitmap_free_range(bitmap_t *, size_t, size_t);
 extern void bitmap_copy(bitmap_t *, bitmap_t *, size_t);