Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
GHC
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexander Kaznacheev
GHC
Commits
faf62056
Commit
faf62056
authored
14 years ago
by
Simon Marlow
Browse files
Options
Downloads
Patches
Plain Diff
fix the new capset events: they were being emitted even without +RTS -Ds.
parent
8e1f5e35
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
rts/Trace.h
+13
-5
13 additions, 5 deletions
rts/Trace.h
with
13 additions
and
5 deletions
rts/Trace.h
+
13
−
5
View file @
faf62056
...
@@ -178,6 +178,14 @@ void traceEventStartup_ (int n_caps);
...
@@ -178,6 +178,14 @@ void traceEventStartup_ (int n_caps);
* the capset info events so for simplicity, rather than working out if
* the capset info events so for simplicity, rather than working out if
* they're necessary we always emit them. They should be very low volume.
* they're necessary we always emit them. They should be very low volume.
*/
*/
/*
* Emit a message/event describing the state of a thread
*/
#define traceCapsetModify(tag, capset, other) \
if (RTS_UNLIKELY(TRACE_sched)) { \
traceCapsetModify_(tag,capset,other); \
}
void
traceCapsetModify_
(
EventTypeNum
tag
,
void
traceCapsetModify_
(
EventTypeNum
tag
,
CapsetID
capset
,
CapsetID
capset
,
StgWord32
other
);
StgWord32
other
);
...
@@ -195,7 +203,7 @@ void traceOSProcessInfo_ (void);
...
@@ -195,7 +203,7 @@ void traceOSProcessInfo_ (void);
#define debugTraceCap(class, cap, str, ...)
/* nothing */
#define debugTraceCap(class, cap, str, ...)
/* nothing */
#define traceThreadStatus(class, tso)
/* nothing */
#define traceThreadStatus(class, tso)
/* nothing */
#define traceEventStartup_(n_caps)
/* nothing */
#define traceEventStartup_(n_caps)
/* nothing */
#define traceCapsetModify
_
(tag, capset, other)
/* nothing */
#define traceCapsetModify(tag, capset, other)
/* nothing */
#define traceOSProcessInfo_()
/* nothing */
#define traceOSProcessInfo_()
/* nothing */
#endif
/* TRACING */
#endif
/* TRACING */
...
@@ -448,27 +456,27 @@ INLINE_HEADER void traceEventGcDone(Capability *cap STG_UNUSED)
...
@@ -448,27 +456,27 @@ INLINE_HEADER void traceEventGcDone(Capability *cap STG_UNUSED)
INLINE_HEADER
void
traceCapsetCreate
(
CapsetID
capset
STG_UNUSED
,
INLINE_HEADER
void
traceCapsetCreate
(
CapsetID
capset
STG_UNUSED
,
CapsetType
capset_type
STG_UNUSED
)
CapsetType
capset_type
STG_UNUSED
)
{
{
traceCapsetModify
_
(
EVENT_CAPSET_CREATE
,
capset
,
capset_type
);
traceCapsetModify
(
EVENT_CAPSET_CREATE
,
capset
,
capset_type
);
dtraceCapsetCreate
(
capset
,
capset_type
);
dtraceCapsetCreate
(
capset
,
capset_type
);
}
}
INLINE_HEADER
void
traceCapsetDelete
(
CapsetID
capset
STG_UNUSED
)
INLINE_HEADER
void
traceCapsetDelete
(
CapsetID
capset
STG_UNUSED
)
{
{
traceCapsetModify
_
(
EVENT_CAPSET_DELETE
,
capset
,
0
);
traceCapsetModify
(
EVENT_CAPSET_DELETE
,
capset
,
0
);
dtraceCapsetDelete
(
capset
);
dtraceCapsetDelete
(
capset
);
}
}
INLINE_HEADER
void
traceCapsetAssignCap
(
CapsetID
capset
STG_UNUSED
,
INLINE_HEADER
void
traceCapsetAssignCap
(
CapsetID
capset
STG_UNUSED
,
nat
capno
STG_UNUSED
)
nat
capno
STG_UNUSED
)
{
{
traceCapsetModify
_
(
EVENT_CAPSET_ASSIGN_CAP
,
capset
,
capno
);
traceCapsetModify
(
EVENT_CAPSET_ASSIGN_CAP
,
capset
,
capno
);
dtraceCapsetAssignCap
(
capset
,
capno
);
dtraceCapsetAssignCap
(
capset
,
capno
);
}
}
INLINE_HEADER
void
traceCapsetRemoveCap
(
CapsetID
capset
STG_UNUSED
,
INLINE_HEADER
void
traceCapsetRemoveCap
(
CapsetID
capset
STG_UNUSED
,
nat
capno
STG_UNUSED
)
nat
capno
STG_UNUSED
)
{
{
traceCapsetModify
_
(
EVENT_CAPSET_REMOVE_CAP
,
capset
,
capno
);
traceCapsetModify
(
EVENT_CAPSET_REMOVE_CAP
,
capset
,
capno
);
dtraceCapsetRemoveCap
(
capset
,
capno
);
dtraceCapsetRemoveCap
(
capset
,
capno
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment