aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Howard <howardjohn@google.com>2023-12-19 09:35:32 -0800
committerGopher Robot <gobot@golang.org>2024-01-03 21:01:56 +0000
commit6db1102605f227093ea95538f0fe9e46022ad7ea (patch)
tree2c9db96ed6683486d972eda241f031558930f0ad
parent7d1b82dbf108d6cf80f959bb1558f365cee0ec0e (diff)
downloadgo-6db1102605f227093ea95538f0fe9e46022ad7ea.tar.gz
go-6db1102605f227093ea95538f0fe9e46022ad7ea.zip
pagetrace: fix build when experiment is on
due to a recent change, this experiment does not compile at all. This simply fixes to pass in the new required parameter. Change-Id: Idce0e72fa436a7acf4923717913deb3a37847fe2 Reviewed-on: https://go-review.googlesource.com/c/go/+/551415 Auto-Submit: Michael Knyszek <mknyszek@google.com> Reviewed-by: Michael Knyszek <mknyszek@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
-rw-r--r--src/runtime/pagetrace_on.go2
-rw-r--r--src/runtime/runtime2.go2
-rw-r--r--src/runtime/trace2status.go1
3 files changed, 4 insertions, 1 deletions
diff --git a/src/runtime/pagetrace_on.go b/src/runtime/pagetrace_on.go
index 0e621cb6ca..f82521caad 100644
--- a/src/runtime/pagetrace_on.go
+++ b/src/runtime/pagetrace_on.go
@@ -317,7 +317,7 @@ func finishPageTrace() {
pageTrace.enabled = false
// Execute a ragged barrier, flushing each trace buffer.
- forEachP(func(pp *p) {
+ forEachP(waitReasonPageTraceFlush, func(pp *p) {
if pp.pageTraceBuf.buf != nil {
pp.pageTraceBuf = pp.pageTraceBuf.flush(pp.id, nanotime())
}
diff --git a/src/runtime/runtime2.go b/src/runtime/runtime2.go
index 2d3fd30e63..63320d4a8a 100644
--- a/src/runtime/runtime2.go
+++ b/src/runtime/runtime2.go
@@ -1127,6 +1127,7 @@ const (
waitReasonFlushProcCaches // "flushing proc caches"
waitReasonTraceGoroutineStatus // "trace goroutine status"
waitReasonTraceProcStatus // "trace proc status"
+ waitReasonPageTraceFlush // "page trace flush"
waitReasonCoroutine // "coroutine"
)
@@ -1166,6 +1167,7 @@ var waitReasonStrings = [...]string{
waitReasonFlushProcCaches: "flushing proc caches",
waitReasonTraceGoroutineStatus: "trace goroutine status",
waitReasonTraceProcStatus: "trace proc status",
+ waitReasonPageTraceFlush: "page trace flush",
waitReasonCoroutine: "coroutine",
}
diff --git a/src/runtime/trace2status.go b/src/runtime/trace2status.go
index a4a8905196..5016e08656 100644
--- a/src/runtime/trace2status.go
+++ b/src/runtime/trace2status.go
@@ -147,6 +147,7 @@ func goStatusToTraceGoStatus(status uint32, wr waitReason) traceGoStatus {
wr == waitReasonGCMarkTermination ||
wr == waitReasonGarbageCollection ||
wr == waitReasonTraceProcStatus ||
+ wr == waitReasonPageTraceFlush ||
wr == waitReasonGCWorkerActive {
tgs = traceGoRunning
}