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>

diff --git a/src/runtime/pagetrace_on.go b/src/runtime/pagetrace_on.go
index 0e621cb6ca5f20a1d7e02f9d2234c0a360430260..f82521caadd643c22fdf8e2499bd5721474c78e5 100644 (file)
--- 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 2d3fd30e633bb83826ce6996d7af67a10d8ec54c..63320d4a8a30137e3b9b3fc0ba32c4203e6d76b9 100644 (file)
--- 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 a4a89051966d953673e2b6ac33a4e31a6f25d42b..5016e086560a3f93904d091d95fa7b5ea7d1416d 100644 (file)
--- 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
                }