diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2011-11-25 13:11:39 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-11-25 16:11:36 +0000 |
| commit | 6b1098511aaabd2c9503ee7be6da1944466f9cb4 (patch) | |
| tree | 83b3001603c7e6a5cfb3ac04adbb99c40504942e /ghc/ghc.mk | |
| parent | 18aae18503442276e14a47eabf4786bc7210662e (diff) | |
| download | haskell-6b1098511aaabd2c9503ee7be6da1944466f9cb4.tar.gz | |
Time handling overhaul
Terminology cleanup: the type "Ticks" has been renamed "Time", which
is an StgWord64 in units of TIME_RESOLUTION (currently nanoseconds).
The terminology "tick" is now used consistently to mean the interval
between timer signals.
The ticker now always ticks in realtime (actually CLOCK_MONOTONIC if
we have it). Before it used CPU time in the non-threaded RTS and
realtime in the threaded RTS, but I've discovered that the CPU timer
has terrible resolution (at least on Linux) and isn't much use for
profiling. So now we always use realtime. This should also fix
The default tick interval is now 10ms, except when profiling where we
drop it to 1ms. This gives more accurate profiles without affecting
runtime too much (<1%).
Lots of cleanups - the resolution of Time is now in one place
only (Rts.h) rather than having calculations that depend on the
resolution scattered all over the RTS. I hope I found them all.
Diffstat (limited to 'ghc/ghc.mk')
| -rw-r--r-- | ghc/ghc.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ghc/ghc.mk b/ghc/ghc.mk index 38b3016b30..2af90bed28 100644 --- a/ghc/ghc.mk +++ b/ghc/ghc.mk @@ -26,8 +26,11 @@ ghc_stage1_MORE_HC_OPTS = $(GhcStage1HcOpts) ghc_stage2_MORE_HC_OPTS = $(GhcStage2HcOpts) ghc_stage3_MORE_HC_OPTS = $(GhcStage3HcOpts) -ghc_stage2_CC_OPTS = -Iincludes -ghc_stage3_CC_OPTS = -Iincludes +# We need __GLASGOW_HASKELL__ in hschooks.c, so we have to build C +# sources with GHC: +ghc_stage1_UseGhcForCC = YES +ghc_stage2_UseGhcForCC = YES +ghc_stage3_UseGhcForCC = YES ghc_stage1_C_FILES_NODEPS = ghc/hschooks.c |