projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2006-01-04 12:51:59 by simonmar]
[ghc-hetmet.git]
/
ghc
/
includes
/
Storage.h
diff --git
a/ghc/includes/Storage.h
b/ghc/includes/Storage.h
index
ce944c8
..
e37c50d
100644
(file)
--- a/
ghc/includes/Storage.h
+++ b/
ghc/includes/Storage.h
@@
-145,7
+145,7
@@
extern void exitStorage(void);
-------------------------------------------------------------------------- */
extern StgPtr allocate ( nat n );
-------------------------------------------------------------------------- */
extern StgPtr allocate ( nat n );
-extern StgPtr allocateLocal ( StgRegTable *reg, nat n );
+extern StgPtr allocateLocal ( Capability *cap, nat n );
extern StgPtr allocatePinned ( nat n );
extern lnat allocated_bytes ( void );
extern StgPtr allocatePinned ( nat n );
extern lnat allocated_bytes ( void );
@@
-205,9
+205,11
@@
extern Mutex sm_mutex;
#if defined(SMP)
#define ACQUIRE_SM_LOCK ACQUIRE_LOCK(&sm_mutex);
#define RELEASE_SM_LOCK RELEASE_LOCK(&sm_mutex);
#if defined(SMP)
#define ACQUIRE_SM_LOCK ACQUIRE_LOCK(&sm_mutex);
#define RELEASE_SM_LOCK RELEASE_LOCK(&sm_mutex);
+#define ASSERT_SM_LOCK() ASSERT_LOCK_HELD(&sm_mutex);
#else
#define ACQUIRE_SM_LOCK
#define RELEASE_SM_LOCK
#else
#define ACQUIRE_SM_LOCK
#define RELEASE_SM_LOCK
+#define ASSERT_SM_LOCK()
#endif
INLINE_HEADER void
#endif
INLINE_HEADER void
@@
-390,7
+392,7
@@
extern lnat countNurseryBlocks ( void );
Functions from GC.c
-------------------------------------------------------------------------- */
Functions from GC.c
-------------------------------------------------------------------------- */
-extern void threadPaused ( StgTSO * );
+extern void threadPaused ( Capability *cap, StgTSO * );
extern StgClosure * isAlive ( StgClosure *p );
extern void markCAFs ( evac_fn evac );
extern StgClosure * isAlive ( StgClosure *p );
extern void markCAFs ( evac_fn evac );