[commit: ghc] ghc-7.6: Expose the prototype for getMonotonicNSec (9c1edfa)
Ian Lynagh
igloo at earth.li
Fri Jan 18 00:18:56 CET 2013
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : ghc-7.6
http://hackage.haskell.org/trac/ghc/changeset/9c1edfa84dfd8e6b2441c8d8558f3471ea9a6628
>---------------------------------------------------------------
commit 9c1edfa84dfd8e6b2441c8d8558f3471ea9a6628
Author: Ian Lynagh <ian at well-typed.com>
Date: Thu Jan 17 15:33:26 2013 +0000
Expose the prototype for getMonotonicNSec
Fixes T3807 on OS X 32.
>---------------------------------------------------------------
includes/Rts.h | 1 +
includes/rts/{Timer.h => GetTime.h} | 12 +++++-------
rts/GetTime.h | 1 -
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/includes/Rts.h b/includes/Rts.h
index c52fe63..3aa7660 100644
--- a/includes/Rts.h
+++ b/includes/Rts.h
@@ -227,6 +227,7 @@ INLINE_HEADER Time fsecondsToTime (double t)
#include "rts/Flags.h"
#include "rts/Adjustor.h"
#include "rts/FileLock.h"
+#include "rts/GetTime.h"
#include "rts/Globals.h"
#include "rts/IOManager.h"
#include "rts/Linker.h"
diff --git a/includes/rts/Timer.h b/includes/rts/GetTime.h
similarity index 65%
copy from includes/rts/Timer.h
copy to includes/rts/GetTime.h
index 9563f6a..79cef4f 100644
--- a/includes/rts/Timer.h
+++ b/includes/rts/GetTime.h
@@ -2,7 +2,7 @@
*
* (c) The GHC Team, 1995-2009
*
- * Interface to the RTS timer signal (uses OS-dependent Ticker.h underneath)
+ * Interface to the RTS time
*
* Do not #include this file directly: #include "Rts.h" instead.
*
@@ -11,11 +11,9 @@
*
* ---------------------------------------------------------------------------*/
-#ifndef RTS_TIMER_H
-#define RTS_TIMER_H
+#ifndef RTS_GETTIME_H
+#define RTS_GETTIME_H
-void startTimer (void);
-void stopTimer (void);
-int rtsTimerSignal (void);
+StgWord64 getMonotonicNSec (void);
-#endif /* RTS_TIMER_H */
+#endif /* RTS_GETTIME_H */
diff --git a/rts/GetTime.h b/rts/GetTime.h
index 4b967b5..32c3754 100644
--- a/rts/GetTime.h
+++ b/rts/GetTime.h
@@ -12,7 +12,6 @@
#include "BeginPrivate.h"
void initializeTimer (void);
-StgWord64 getMonotonicNSec (void);
Time getProcessCPUTime (void);
Time getThreadCPUTime (void);
More information about the ghc-commits
mailing list