projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-11-17 14:23:30 by simonmar]
[ghc-hetmet.git]
/
ghc
/
rts
/
BlockAlloc.c
diff --git
a/ghc/rts/BlockAlloc.c
b/ghc/rts/BlockAlloc.c
index
65205f8
..
63da2a2
100644
(file)
--- a/
ghc/rts/BlockAlloc.c
+++ b/
ghc/rts/BlockAlloc.c
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: BlockAlloc.c,v 1.10 2001/08/14 13:40:09 sewardj Exp $
+ * $Id: BlockAlloc.c,v 1.17 2003/11/12 17:49:05 sof Exp $
*
* (c) The GHC Team 1998-2000
*
*
* (c) The GHC Team 1998-2000
*
@@
-23,11
+23,13
@@
#include "BlockAlloc.h"
#include "MBlock.h"
#include "BlockAlloc.h"
#include "MBlock.h"
+#include <string.h>
+
static void initMBlock(void *mblock);
static bdescr *allocMegaGroup(nat mblocks);
static void freeMegaGroup(bdescr *bd);
static void initMBlock(void *mblock);
static bdescr *allocMegaGroup(nat mblocks);
static void freeMegaGroup(bdescr *bd);
-static bdescr *free_list;
+static bdescr *free_list = NULL;
/* -----------------------------------------------------------------------------
Initialisation
/* -----------------------------------------------------------------------------
Initialisation
@@
-35,14
+37,14
@@
static bdescr *free_list;
void initBlockAllocator(void)
{
void initBlockAllocator(void)
{
- free_list = NULL;
+ // The free list starts off NULL
}
/* -----------------------------------------------------------------------------
Allocation
-------------------------------------------------------------------------- */
}
/* -----------------------------------------------------------------------------
Allocation
-------------------------------------------------------------------------- */
-static inline void
+STATIC_INLINE void
initGroup(nat n, bdescr *head)
{
bdescr *bd;
initGroup(nat n, bdescr *head)
{
bdescr *bd;
@@
-53,6
+55,7
@@
initGroup(nat n, bdescr *head)
head->free = head->start;
for (i=1, bd = head+1; i < n; i++, bd++) {
bd->free = 0;
head->free = head->start;
for (i=1, bd = head+1; i < n; i++, bd++) {
bd->free = 0;
+ bd->blocks = 0;
bd->link = head;
}
}
bd->link = head;
}
}
@@
-191,19
+194,21
@@
allocMegaGroup(nat n)
* pointer to the newly enlarged group p.
*/
* pointer to the newly enlarged group p.
*/
-static inline bdescr *
+STATIC_INLINE bdescr *
coalesce(bdescr *p)
{
bdescr *bd, *q;
coalesce(bdescr *p)
{
bdescr *bd, *q;
- nat i;
+ nat i, blocks;
q = p->link;
if (q != NULL && p->start + p->blocks * BLOCK_SIZE_W == q->start) {
/* can coalesce */
p->blocks += q->blocks;
p->link = q->link;
q = p->link;
if (q != NULL && p->start + p->blocks * BLOCK_SIZE_W == q->start) {
/* can coalesce */
p->blocks += q->blocks;
p->link = q->link;
- for (i = 0, bd = q; i < q->blocks; bd++, i++) {
+ blocks = q->blocks;
+ for (i = 0, bd = q; i < blocks; bd++, i++) {
bd->free = 0;
bd->free = 0;
+ bd->blocks = 0;
bd->link = p;
}
return p;
bd->link = p;
}
return p;
@@
-260,7
+265,7
@@
freeMegaGroup(bdescr *p)
n = p->blocks * BLOCK_SIZE / MBLOCK_SIZE + 1;
for (; n > 0; (W_)p += MBLOCK_SIZE, n--) {
n = p->blocks * BLOCK_SIZE / MBLOCK_SIZE + 1;
for (; n > 0; (W_)p += MBLOCK_SIZE, n--) {
- initMBlock((void *)((W_)p & ~MBLOCK_MASK));
+ initMBlock(MBLOCK_ROUND_DOWN(p));
initGroup(BLOCKS_PER_MBLOCK, p);
freeGroup(p);
}
initGroup(BLOCKS_PER_MBLOCK, p);
freeGroup(p);
}
@@
-301,6
+306,18
@@
initMBlock(void *mblock)
-------------------------------------------------------------------------- */
#ifdef DEBUG
-------------------------------------------------------------------------- */
#ifdef DEBUG
+static void
+checkWellFormedGroup( bdescr *bd )
+{
+ nat i;
+
+ for (i = 1; i < bd->blocks; i++) {
+ ASSERT(bd[i].blocks == 0);
+ ASSERT(bd[i].free == 0);
+ ASSERT(bd[i].link == bd);
+ }
+}
+
void
checkFreeListSanity(void)
{
void
checkFreeListSanity(void)
{
@@
-311,6
+328,7
@@
checkFreeListSanity(void)
fprintf(stderr,"group at 0x%x, length %d blocks\n",
(nat)bd->start, bd->blocks));
ASSERT(bd->blocks > 0);
fprintf(stderr,"group at 0x%x, length %d blocks\n",
(nat)bd->start, bd->blocks));
ASSERT(bd->blocks > 0);
+ checkWellFormedGroup(bd);
if (bd->link != NULL) {
/* make sure we're fully coalesced */
ASSERT(bd->start + bd->blocks * BLOCK_SIZE_W != bd->link->start);
if (bd->link != NULL) {
/* make sure we're fully coalesced */
ASSERT(bd->start + bd->blocks * BLOCK_SIZE_W != bd->link->start);