[freenos] [freenos commit] r175 - Fixed assignment of the 'ptr' variable in BitMap::markNext().
- From: codesite-noreply@xxxxxxxxxx
- To: freenos@xxxxxxxxxxxxx
- Date: Wed, 01 Jul 2009 11:49:53 +0000
Author: nieklinnenbank
Date: Wed Jul 1 02:56:21 2009
New Revision: 175
Modified:
trunk/include/BitMap.h
Log:
Fixed assignment of the 'ptr' variable in BitMap::markNext().
It previously was assigned the address of the map variable, instead
of the address to which map actually points. Additionally, the map
variable is cleared to zero in the BitMap() constructor, a getMap()
function was added and the 'const' modifier is applied where appropriate.
Modified: trunk/include/BitMap.h
==============================================================================
--- trunk/include/BitMap.h (original)
+++ trunk/include/BitMap.h Wed Jul 1 02:56:21 2009
@@ -20,11 +20,12 @@
#include "Macros.h"
#include "Assert.h"
+#include <string.h>
/**
- * Bit map template class.
+ * Class capable of (un)marking bits inside a binary bitmap.
*/
-template <class T> class BitMap
+class BitMap
{
public:
@@ -35,6 +36,7 @@
BitMap(Size cnt) : count(cnt), free(cnt)
{
map = new u8[(cnt / 8) + 1];
+ memset(map, 0, (cnt / 8) + 1);
}
/**
@@ -73,7 +75,7 @@
for (Size i = 0; i < num; i++)
{
/* Point to the correct offset. */
- ptr = (Address *) (&map) + i;
+ ptr = ((Address *) (map)) + i;
/* Any blocks free? */
if (*ptr != (Address) ~ZERO)
@@ -117,12 +119,21 @@
* @param bit Bit number to check.
* @return True if marked, false otherwise.
*/
- bool isMarked(Size bit)
+ bool isMarked(Size bit) const
{
assert(bit < count);
assertRead(map);
return map[bit / 8] & (bit % 8);
+ }
+
+ /**
+ * Retrieve a pointer to the internal bitmap.
+ * @return Internal bitmap.
+ */
+ u8 * getMap() const
+ {
+ return map;
}
private:
Other related posts:
- » [freenos] [freenos commit] r175 - Fixed assignment of the 'ptr' variable in BitMap::markNext(). - codesite-noreply
