projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unify event logging and debug tracing.
[ghc-hetmet.git]
/
rts
/
Schedule.h
diff --git
a/rts/Schedule.h
b/rts/Schedule.h
index
0e18168
..
1214fd8
100644
(file)
--- a/
rts/Schedule.h
+++ b/
rts/Schedule.h
@@
-10,9
+10,11
@@
#ifndef SCHEDULE_H
#define SCHEDULE_H
#ifndef SCHEDULE_H
#define SCHEDULE_H
-#include "OSThreads.h"
+#include "rts/OSThreads.h"
#include "Capability.h"
#include "Capability.h"
-#include "EventLog.h"
+#include "Trace.h"
+
+#pragma GCC visibility push(hidden)
/* initScheduler(), exitScheduler()
* Called from STG : no
/* initScheduler(), exitScheduler()
* Called from STG : no
@@
-30,28
+32,13
@@
void scheduleThread (Capability *cap, StgTSO *tso);
// the desired Capability).
void scheduleThreadOn(Capability *cap, StgWord cpu, StgTSO *tso);
// the desired Capability).
void scheduleThreadOn(Capability *cap, StgWord cpu, StgTSO *tso);
-/* awakenBlockedQueue()
- *
- * Takes a pointer to the beginning of a blocked TSO queue, and
- * wakes up the entire queue.
- * Called from STG : yes
- * Locks assumed : none
- */
-void awakenBlockedQueue (Capability *cap, StgTSO *tso);
-
/* wakeUpRts()
*
* Causes an OS thread to wake up and run the scheduler, if necessary.
*/
/* wakeUpRts()
*
* Causes an OS thread to wake up and run the scheduler, if necessary.
*/
+#if defined(THREADED_RTS)
void wakeUpRts(void);
void wakeUpRts(void);
-
-/* unblockOne()
- *
- * Put the specified thread on the run queue of the given Capability.
- * Called from STG : yes
- * Locks assumed : we own the Capability.
- */
-StgTSO * unblockOne (Capability *cap, StgTSO *tso);
+#endif
/* raiseExceptionHelper */
StgWord raiseExceptionHelper (StgRegTable *reg, StgTSO *tso, StgClosure *exception);
/* raiseExceptionHelper */
StgWord raiseExceptionHelper (StgRegTable *reg, StgTSO *tso, StgClosure *exception);
@@
-69,11
+56,6
@@
StgWord findRetryFrameHelper (StgTSO *tso);
void OSThreadProcAttr workerStart(Task *task);
#endif
void OSThreadProcAttr workerStart(Task *task);
#endif
-char *info_type(StgClosure *closure); // dummy
-char *info_type_by_ip(StgInfoTable *ip); // dummy
-void awaken_blocked_queue(StgTSO *q);
-void initThread(StgTSO *tso, nat stack_size);
-
/* The state of the scheduler. This is used to control the sequence
* of events during shutdown, and when the runtime is interrupted
* using ^C.
/* The state of the scheduler. This is used to control the sequence
* of events during shutdown, and when the runtime is interrupted
* using ^C.
@@
-82,7
+64,7
@@
void initThread(StgTSO *tso, nat stack_size);
#define SCHED_INTERRUPTING 1 /* ^C detected, before threads are deleted */
#define SCHED_SHUTTING_DOWN 2 /* final shutdown */
#define SCHED_INTERRUPTING 1 /* ^C detected, before threads are deleted */
#define SCHED_SHUTTING_DOWN 2 /* final shutdown */
-extern volatile StgWord RTS_VAR(sched_state);
+extern volatile StgWord sched_state;
/*
* flag that tracks whether we have done any execution in this time slice.
/*
* flag that tracks whether we have done any execution in this time slice.
@@
-105,10
+87,10
@@
extern volatile StgWord recent_activity;
*
* In GranSim we have one run/blocked_queue per PE.
*/
*
* In GranSim we have one run/blocked_queue per PE.
*/
-extern StgTSO *RTS_VAR(blackhole_queue);
+extern StgTSO *blackhole_queue;
#if !defined(THREADED_RTS)
#if !defined(THREADED_RTS)
-extern StgTSO *RTS_VAR(blocked_queue_hd), *RTS_VAR(blocked_queue_tl);
-extern StgTSO *RTS_VAR(sleeping_queue);
+extern StgTSO *blocked_queue_hd, *blocked_queue_tl;
+extern StgTSO *sleeping_queue;
#endif
/* Set to rtsTrue if there are threads on the blackhole_queue, and
#endif
/* Set to rtsTrue if there are threads on the blackhole_queue, and
@@
-123,27
+105,15
@@
extern rtsBool blackholes_need_checking;
extern rtsBool heap_overflow;
#if defined(THREADED_RTS)
extern rtsBool heap_overflow;
#if defined(THREADED_RTS)
-extern Mutex RTS_VAR(sched_mutex);
+extern Mutex sched_mutex;
#endif
#endif
-SchedulerStatus rts_mainLazyIO(HaskellObj p, /*out*/HaskellObj *ret);
-
/* Called by shutdown_handler(). */
void interruptStgRts (void);
/* Called by shutdown_handler(). */
void interruptStgRts (void);
-nat run_queue_len (void);
-
void resurrectThreads (StgTSO *);
void performPendingThrowTos (StgTSO *);
void resurrectThreads (StgTSO *);
void performPendingThrowTos (StgTSO *);
-void printAllThreads(void);
-
-/* debugging only
- */
-#ifdef DEBUG
-void print_bq (StgClosure *node);
-#endif
-
/* -----------------------------------------------------------------------------
* Some convenient macros/inline functions...
*/
/* -----------------------------------------------------------------------------
* Some convenient macros/inline functions...
*/
@@
-166,7
+136,7
@@
appendToRunQueue (Capability *cap, StgTSO *tso)
setTSOLink(cap, cap->run_queue_tl, tso);
}
cap->run_queue_tl = tso;
setTSOLink(cap, cap->run_queue_tl, tso);
}
cap->run_queue_tl = tso;
- postEvent (cap, EVENT_THREAD_RUNNABLE, tso->id, 0);
+ traceSchedEvent (cap, EVENT_THREAD_RUNNABLE, tso, 0);
}
/* Push a thread on the beginning of the run queue.
}
/* Push a thread on the beginning of the run queue.
@@
-271,5
+241,7
@@
emptyThreadQueues(Capability *cap)
#endif /* !IN_STG_CODE */
#endif /* !IN_STG_CODE */
+#pragma GCC visibility pop
+
#endif /* SCHEDULE_H */
#endif /* SCHEDULE_H */