projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
comply with Haskell 98 by not allowing extra commas in import/export lists
[ghc-hetmet.git]
/
rts
/
MBlock.c
diff --git
a/rts/MBlock.c
b/rts/MBlock.c
index
fa8fd49
..
76645e2
100644
(file)
--- a/
rts/MBlock.c
+++ b/
rts/MBlock.c
@@
-16,6
+16,7
@@
#include "RtsFlags.h"
#include "MBlock.h"
#include "BlockAlloc.h"
#include "RtsFlags.h"
#include "MBlock.h"
#include "BlockAlloc.h"
+#include "Trace.h"
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
@@
-287,7
+288,7
@@
getMBlocks(nat n)
// ToDo: check that we haven't already grabbed the memory at next_request
next_request = ret + size;
// ToDo: check that we haven't already grabbed the memory at next_request
next_request = ret + size;
- IF_DEBUG(gc,debugBelch("Allocated %d megablock(s) at %p\n",n,ret));
+ debugTrace(DEBUG_gc, "allocated %d megablock(s) at %p",n,ret);
// fill in the table
for (i = 0; i < n; i++) {
// fill in the table
for (i = 0; i < n; i++) {
@@
-394,15
+395,15
@@
getMBlocks(nat n)
}
}
}
}
- if (((W_)ret & MBLOCK_MASK) != 0) {
- barf("getMBlocks: misaligned block returned");
- }
-
if (ret == (void*)-1) {
barf("getMBlocks: unknown memory allocation failure on Win32.");
}
if (ret == (void*)-1) {
barf("getMBlocks: unknown memory allocation failure on Win32.");
}
- IF_DEBUG(gc,debugBelch("Allocated %d megablock(s) at 0x%x\n",n,(nat)ret));
+ if (((W_)ret & MBLOCK_MASK) != 0) {
+ barf("getMBlocks: misaligned block returned");
+ }
+
+ debugTrace(DEBUG_gc, "allocated %d megablock(s) at 0x%x",n,(nat)ret);
next_request = (char*)next_request + size;
mblocks_allocated += n;
next_request = (char*)next_request + size;
mblocks_allocated += n;