Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/ff7ee297b541101f930edf1a1c0a8323f49ccd5b >--------------------------------------------------------------- commit ff7ee297b541101f930edf1a1c0a8323f49ccd5b Author: Karel Gardas <[email protected]> Date: Wed Jan 12 05:18:29 2011 +0000 replace C++ comments with C comments (Solaris' DTrace fails on C++ comments) >--------------------------------------------------------------- includes/rts/EventLogFormat.h | 6 ++-- rts/RtsProbes.d | 54 +++++++++++++++++++++------------------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/includes/rts/EventLogFormat.h b/includes/rts/EventLogFormat.h index 5741ad9..f3f56c9 100644 --- a/includes/rts/EventLogFormat.h +++ b/includes/rts/EventLogFormat.h @@ -155,11 +155,11 @@ #ifndef EVENTLOG_CONSTANTS_ONLY typedef StgWord16 EventTypeNum; -typedef StgWord64 EventTimestamp; // in nanoseconds +typedef StgWord64 EventTimestamp; /* in nanoseconds */ typedef StgWord32 EventThreadID; typedef StgWord16 EventCapNo; -typedef StgWord16 EventPayloadSize; // variable-size events -typedef StgWord16 EventThreadStatus; // status for EVENT_STOP_THREAD +typedef StgWord16 EventPayloadSize; /* variable-size events */ +typedef StgWord16 EventThreadStatus; /* status for EVENT_STOP_THREAD */ #endif diff --git a/rts/RtsProbes.d b/rts/RtsProbes.d index 6312c43..dbc5111 100644 --- a/rts/RtsProbes.d +++ b/rts/RtsProbes.d @@ -10,30 +10,32 @@ #include "rts/EventLogFormat.h" -// ----------------------------------------------------------------------------- -// Payload datatypes for Haskell events -// ----------------------------------------------------------------------------- - -// We effectively have: -// -// typedef uint16_t EventTypeNum; -// typedef uint64_t EventTimestamp; // in nanoseconds -// typedef uint32_t EventThreadID; -// typedef uint16_t EventCapNo; -// typedef uint16_t EventPayloadSize; // variable-size events -// typedef uint16_t EventThreadStatus; - - -// ----------------------------------------------------------------------------- -// The HaskellEvent provider captures everything from eventlog for use with -// dtrace -// ----------------------------------------------------------------------------- - -// These probes correspond to the events defined in EventLogFormat.h -// +/* ----------------------------------------------------------------------------- + * Payload datatypes for Haskell events + * ----------------------------------------------------------------------------- + */ + +/* We effectively have: + * + * typedef uint16_t EventTypeNum; + * typedef uint64_t EventTimestamp; // in nanoseconds + * typedef uint32_t EventThreadID; + * typedef uint16_t EventCapNo; + * typedef uint16_t EventPayloadSize; // variable-size events + * typedef uint16_t EventThreadStatus; + */ + +/* ----------------------------------------------------------------------------- + * The HaskellEvent provider captures everything from eventlog for use with + * dtrace + * ----------------------------------------------------------------------------- + */ + +/* These probes correspond to the events defined in EventLogFormat.h + */ provider HaskellEvent { - // scheduler events + /* scheduler events */ probe create__thread (EventCapNo, EventThreadID); probe run__thread (EventCapNo, EventThreadID); probe stop__thread (EventCapNo, EventThreadID, EventThreadStatus, EventThreadID); @@ -49,11 +51,11 @@ provider HaskellEvent { probe request__par__gc (EventCapNo); probe create__spark__thread (EventCapNo, EventThreadID); - // other events -//This one doesn't seem to be used at all at the moment: -// probe log__msg (char *); + /* other events */ +/* This one doesn't seem to be used at all at the moment: */ +/* probe log__msg (char *); */ probe startup (EventCapNo); - // we don't need EVENT_BLOCK_MARKER with dtrace + /* we don't need EVENT_BLOCK_MARKER with dtrace */ probe user__msg (EventCapNo, char *); probe gc__idle (EventCapNo); probe gc__work (EventCapNo); _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
