projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-08-13 13:04:50 by simonmar]
[ghc-hetmet.git]
/
ghc
/
rts
/
FrontPanel.c
diff --git
a/ghc/rts/FrontPanel.c
b/ghc/rts/FrontPanel.c
index
34cf5d8
..
85faeeb
100644
(file)
--- a/
ghc/rts/FrontPanel.c
+++ b/
ghc/rts/FrontPanel.c
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: FrontPanel.c,v 1.6 2001/08/16 05:30:27 chak Exp $
+ * $Id: FrontPanel.c,v 1.9 2004/08/13 13:09:49 simonmar Exp $
*
* (c) The GHC Team 2000
*
*
* (c) The GHC Team 2000
*
@@
-17,7
+17,6
@@
#include "MBlock.h"
#include "FrontPanel.h"
#include "Storage.h"
#include "MBlock.h"
#include "FrontPanel.h"
#include "Storage.h"
-#include "StoragePriv.h"
#include "Stats.h"
#include "RtsFlags.h"
#include "Schedule.h"
#include "Stats.h"
#include "RtsFlags.h"
#include "Schedule.h"
@@
-397,6
+396,7
@@
updateFrontPanel( void )
block_width, block_height, blocks_per_line );
}
block_width, block_height, blocks_per_line );
}
+#if 0 /* Segfaults because bd appears to be bogus but != NULL. stolz, 2003-06-24 */
/* color each block */
for (; a <= LAST_BLOCK(m); (char *)a += BLOCK_SIZE) {
bd = Bdescr((P_)a);
/* color each block */
for (; a <= LAST_BLOCK(m); (char *)a += BLOCK_SIZE) {
bd = Bdescr((P_)a);
@@
-409,6
+409,7
@@
updateFrontPanel( void )
block_width, block_height, blocks_per_line );
}
}
block_width, block_height, blocks_per_line );
}
}
+#endif
}
}
@@
-673,7
+674,7
@@
residencyCensus( void )
type = BlackHole;
break;
type = BlackHole;
break;
- case AP_UPD:
+ case AP:
size = pap_sizeW((StgPAP *)p);
type = Thunk;
break;
size = pap_sizeW((StgPAP *)p);
type = Thunk;
break;
@@
-704,6
+705,7
@@
residencyCensus( void )
case STABLE_NAME:
case MVAR:
case MUT_VAR:
case STABLE_NAME:
case MVAR:
case MUT_VAR:
+ case MUT_CONS:
case IND_PERM:
case IND_OLDGEN_PERM:
size = sizeW_fromITBL(info);
case IND_PERM:
case IND_OLDGEN_PERM:
size = sizeW_fromITBL(info);