projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-11-13 12:21:08 by simonmar]
[ghc-hetmet.git]
/
ghc
/
rts
/
BlockAlloc.c
diff --git
a/ghc/rts/BlockAlloc.c
b/ghc/rts/BlockAlloc.c
index
166ef3a
..
9d13719
100644
(file)
--- a/
ghc/rts/BlockAlloc.c
+++ b/
ghc/rts/BlockAlloc.c
@@
-1,7
+1,7
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: BlockAlloc.c,v 1.5 1999/03/26 14:54:43 simonm Exp $
+ * $Id: BlockAlloc.c,v 1.14 2002/07/17 09:21:49 simonmar Exp $
*
*
- * (c) The GHC Team 1998-1999
+ * (c) The GHC Team 1998-2000
*
* The block allocator and free list manager.
*
*
* The block allocator and free list manager.
*
@@
-16,12
+16,15
@@
*
* ---------------------------------------------------------------------------*/
*
* ---------------------------------------------------------------------------*/
+#include "PosixSource.h"
#include "Rts.h"
#include "RtsFlags.h"
#include "RtsUtils.h"
#include "BlockAlloc.h"
#include "MBlock.h"
#include "Rts.h"
#include "RtsFlags.h"
#include "RtsUtils.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);
@@
-52,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;
}
}
@@
-63,6
+67,8
@@
allocGroup(nat n)
void *mblock;
bdescr *bd, **last;
void *mblock;
bdescr *bd, **last;
+ ASSERT(n != 0);
+
if (n > BLOCKS_PER_MBLOCK) {
return allocMegaGroup(BLOCKS_TO_MBLOCKS(n));
}
if (n > BLOCKS_PER_MBLOCK) {
return allocMegaGroup(BLOCKS_TO_MBLOCKS(n));
}
@@
-73,6
+79,9
@@
allocGroup(nat n)
*last = bd->link;
/* no initialisation necessary - this is already a
* self-contained block group. */
*last = bd->link;
/* no initialisation necessary - this is already a
* self-contained block group. */
+#ifdef DEBUG
+ bd->free = bd->start; /* block isn't free now */
+#endif
return bd;
}
if (bd->blocks > n) { /* block too big... */
return bd;
}
if (bd->blocks > n) { /* block too big... */
@@
-128,7
+137,9
@@
allocMegaGroup(nat n)
if (bd->blocks == BLOCKS_PER_MBLOCK) { /* whole megablock found */
if (bd->blocks == BLOCKS_PER_MBLOCK) { /* whole megablock found */
- if (grp_start == NULL) { /* is it the first one we've found? */
+ /* is it the first one we've found or a non-contiguous megablock? */
+ if (grp_start == NULL ||
+ bd->start != last->start + MBLOCK_SIZE/sizeof(W_)) {
grp_start = bd;
grp_prev = last;
mbs_found = 1;
grp_start = bd;
grp_prev = last;
mbs_found = 1;
@@
-187,15
+198,17
@@
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;
@@
-217,7
+230,7
@@
freeGroup(bdescr *p)
#ifdef DEBUG
p->free = (void *)-1; /* indicates that this block is free */
p->step = NULL;
#ifdef DEBUG
p->free = (void *)-1; /* indicates that this block is free */
p->step = NULL;
- p->gen = NULL;
+ p->gen_no = 0;
/* fill the block group with garbage if sanity checking is on */
IF_DEBUG(sanity,memset(p->start, 0xaa, p->blocks * BLOCK_SIZE));
#endif
/* fill the block group with garbage if sanity checking is on */
IF_DEBUG(sanity,memset(p->start, 0xaa, p->blocks * BLOCK_SIZE));
#endif
@@
-293,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)
{
@@
-303,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);