Changeset 0c2d9bb in mainline for kernel/generic/include/adt/bitmap.h

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

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 block_size;
-        uint8_t *blocks;
+        size_t next_fit;
 } bitmap_t;
 
@@ -52 +50 @@
     unsigned int value)
 {
-        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));
-                        }
-                }
+        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;
         }
 }
@@ -80 +69 @@
                 return 0;
         
-        return !!((bitmap->bits)[element / BITMAP_ELEMENT] &
-            (1 << (element & BITMAP_REMAINER)));
+        size_t byte = element / BITMAP_ELEMENT;
+        uint8_t mask = 1 << (element & BITMAP_REMAINER);
+        
+        return !!((bitmap->bits)[byte] & mask);
 }
 
-extern size_t bitmap_size(size_t, size_t);
-extern void bitmap_initialize(bitmap_t *, size_t, size_t, void *);
+extern size_t bitmap_size(size_t);
+extern void bitmap_initialize(bitmap_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_find_range(bitmap_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 int bitmap_allocate_range(bitmap_t *, size_t, size_t, size_t, size_t,
+    size_t *);
 extern void bitmap_copy(bitmap_t *, bitmap_t *, size_t);