summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2012-10-15 21:52:41 +0100
committerIan Lynagh <ian@well-typed.com>2012-10-15 21:52:41 +0100
commitbb8cb0e72b4a720f32c842d0f7e6b2dad2328578 (patch)
treee460d55d8612ebff7aaa15a5f23b062041aa0a5d /compiler
parentad94e0057053f7c6b014bf091325f7af01f5a0a5 (diff)
parenta609027da31c7c9103d8b9741ba3fc6807b7b7b9 (diff)
downloadhaskell-bb8cb0e72b4a720f32c842d0f7e6b2dad2328578.tar.gz
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
Diffstat (limited to 'compiler')
-rw-r--r--compiler/prelude/primops.txt.pp11
1 files changed, 11 insertions, 0 deletions
diff --git a/compiler/prelude/primops.txt.pp b/compiler/prelude/primops.txt.pp
index 2e56e981a5..7730106c46 100644
--- a/compiler/prelude/primops.txt.pp
+++ b/compiler/prelude/primops.txt.pp
@@ -2203,6 +2203,17 @@ primop TraceEventOp "traceEvent#" GenPrimOp
has_side_effects = True
out_of_line = True
+primop TraceMarkerOp "traceMarker#" GenPrimOp
+ Addr# -> State# s -> State# s
+ { Emits a marker event via the RTS tracing framework. The contents
+ of the event is the zero-terminated byte string passed as the first
+ argument. The event will be emitted either to the .eventlog file,
+ or to stderr, depending on the runtime RTS flags. }
+ with
+ has_side_effects = True
+ out_of_line = True
+
+
------------------------------------------------------------------------
--- ---
------------------------------------------------------------------------