projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the dynamic linker thread-safe.
[ghc-hetmet.git]
/
rts
/
Threads.h
diff --git
a/rts/Threads.h
b/rts/Threads.h
index
541ca87
..
d17235a
100644
(file)
--- a/
rts/Threads.h
+++ b/
rts/Threads.h
@@
-9,19
+9,10
@@
#ifndef THREADS_H
#define THREADS_H
#ifndef THREADS_H
#define THREADS_H
-#if defined(GRAN) || defined(PARALLEL_HASKELL)
-StgBlockingQueueElement * unblockOne (StgBlockingQueueElement *bqe,
- StgClosure *node);
-#else
StgTSO * unblockOne (Capability *cap, StgTSO *tso);
StgTSO * unblockOne_ (Capability *cap, StgTSO *tso, rtsBool allow_migrate);
StgTSO * unblockOne (Capability *cap, StgTSO *tso);
StgTSO * unblockOne_ (Capability *cap, StgTSO *tso, rtsBool allow_migrate);
-#endif
-#if defined(GRAN) || defined(PARALLEL_HASKELL)
-void awakenBlockedQueue(StgBlockingQueueElement *q, StgClosure *node);
-#else
void awakenBlockedQueue (Capability *cap, StgTSO *tso);
void awakenBlockedQueue (Capability *cap, StgTSO *tso);
-#endif
void removeThreadFromMVarQueue (Capability *cap, StgMVar *mvar, StgTSO *tso);
void removeThreadFromQueue (Capability *cap, StgTSO **queue, StgTSO *tso);
void removeThreadFromMVarQueue (Capability *cap, StgMVar *mvar, StgTSO *tso);
void removeThreadFromQueue (Capability *cap, StgTSO **queue, StgTSO *tso);
@@
-34,13
+25,6
@@
void printThreadBlockage (StgTSO *tso);
void printThreadStatus (StgTSO *t);
void printAllThreads (void);
void printThreadQueue (StgTSO *t);
void printThreadStatus (StgTSO *t);
void printAllThreads (void);
void printThreadQueue (StgTSO *t);
-# if defined(PARALLEL_HASKELL)
-void print_bq (StgClosure *node);
-void print_bqe (StgBlockingQueueElement *bqe);
-nat run_queue_len (void);
-# elif defined(GRAN)
-void print_bq (StgClosure *node);
-# endif
#endif
#endif /* THREADS_H */
#endif
#endif /* THREADS_H */