Commit ff7ee297 authored by kgardas's avatar kgardas

replace C++ comments with C comments (Solaris' DTrace fails on C++ comments)

parent a914a224
...@@ -155,11 +155,11 @@ ...@@ -155,11 +155,11 @@
#ifndef EVENTLOG_CONSTANTS_ONLY #ifndef EVENTLOG_CONSTANTS_ONLY
typedef StgWord16 EventTypeNum; typedef StgWord16 EventTypeNum;
typedef StgWord64 EventTimestamp; // in nanoseconds typedef StgWord64 EventTimestamp; /* in nanoseconds */
typedef StgWord32 EventThreadID; typedef StgWord32 EventThreadID;
typedef StgWord16 EventCapNo; typedef StgWord16 EventCapNo;
typedef StgWord16 EventPayloadSize; // variable-size events typedef StgWord16 EventPayloadSize; /* variable-size events */
typedef StgWord16 EventThreadStatus; // status for EVENT_STOP_THREAD typedef StgWord16 EventThreadStatus; /* status for EVENT_STOP_THREAD */
#endif #endif
......
...@@ -10,30 +10,32 @@ ...@@ -10,30 +10,32 @@
#include "rts/EventLogFormat.h" #include "rts/EventLogFormat.h"
// ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
// Payload datatypes for Haskell events * Payload datatypes for Haskell events
// ----------------------------------------------------------------------------- * -----------------------------------------------------------------------------
*/
// We effectively have:
// /* We effectively have:
// typedef uint16_t EventTypeNum; *
// typedef uint64_t EventTimestamp; // in nanoseconds * typedef uint16_t EventTypeNum;
// typedef uint32_t EventThreadID; * typedef uint64_t EventTimestamp; // in nanoseconds
// typedef uint16_t EventCapNo; * typedef uint32_t EventThreadID;
// typedef uint16_t EventPayloadSize; // variable-size events * typedef uint16_t EventCapNo;
// typedef uint16_t EventThreadStatus; * typedef uint16_t EventPayloadSize; // variable-size events
* typedef uint16_t EventThreadStatus;
*/
// -----------------------------------------------------------------------------
// The HaskellEvent provider captures everything from eventlog for use with /* -----------------------------------------------------------------------------
// dtrace * The HaskellEvent provider captures everything from eventlog for use with
// ----------------------------------------------------------------------------- * dtrace
* -----------------------------------------------------------------------------
// These probes correspond to the events defined in EventLogFormat.h */
//
/* These probes correspond to the events defined in EventLogFormat.h
*/
provider HaskellEvent { provider HaskellEvent {
// scheduler events /* scheduler events */
probe create__thread (EventCapNo, EventThreadID); probe create__thread (EventCapNo, EventThreadID);
probe run__thread (EventCapNo, EventThreadID); probe run__thread (EventCapNo, EventThreadID);
probe stop__thread (EventCapNo, EventThreadID, EventThreadStatus, EventThreadID); probe stop__thread (EventCapNo, EventThreadID, EventThreadStatus, EventThreadID);
...@@ -49,11 +51,11 @@ provider HaskellEvent { ...@@ -49,11 +51,11 @@ provider HaskellEvent {
probe request__par__gc (EventCapNo); probe request__par__gc (EventCapNo);
probe create__spark__thread (EventCapNo, EventThreadID); probe create__spark__thread (EventCapNo, EventThreadID);
// other events /* other events */
//This one doesn't seem to be used at all at the moment: /* This one doesn't seem to be used at all at the moment: */
// probe log__msg (char *); /* probe log__msg (char *); */
probe startup (EventCapNo); 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 user__msg (EventCapNo, char *);
probe gc__idle (EventCapNo); probe gc__idle (EventCapNo);
probe gc__work (EventCapNo); probe gc__work (EventCapNo);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment