internal/trace: move fake P IDs to internal/trace/traceviewer

These fake P IDs really only belong to the traceviewer.

Change-Id: I7976beb5750f1efca85e28975074a8c570a9c959
Reviewed-on: https://go-review.googlesource.com/c/go/+/644876
Reviewed-by: Michael Pratt <mpratt@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Michael Knyszek <mknyszek@google.com>

diff --git a/src/cmd/trace/gen.go b/src/cmd/trace/gen.go
index 67811ca04d8678384221f4b4901ba23a93be103f..03ee5037e9f779c68e01e3977c18747f5a70f523 100644 (file)
--- a/src/cmd/trace/gen.go
+++ b/src/cmd/trace/gen.go
@@ -248,7 +248,7 @@ func (g *globalRangeGenerator) GlobalRange(ctx *traceContext, ev *trace.Event) {
                                Name:     r.Name,
                                Ts:       ctx.elapsed(ar.time),
                                Dur:      ev.Time().Sub(ar.time),
-                               Resource: trace.GCP,
+                               Resource: traceviewer.GCP,
                                Stack:    ctx.Stack(viewerFrames(ar.stack)),
                                EndStack: ctx.Stack(viewerFrames(ev.Stack())),
                        })
@@ -267,7 +267,7 @@ func (g *globalRangeGenerator) Finish(ctx *traceContext) {
                        Name:     name,
                        Ts:       ctx.elapsed(ar.time),
                        Dur:      ctx.endTime.Sub(ar.time),
-                       Resource: trace.GCP,
+                       Resource: traceviewer.GCP,
                        Stack:    ctx.Stack(viewerFrames(ar.stack)),
                })
        }

diff --git a/src/cmd/trace/gstate.go b/src/cmd/trace/gstate.go
index c883166e06da2ea1f894dd48a52cafba7f12217e..9c3da66217fd07a7c61bae5be7a97a53b76b3d99 100644 (file)
--- a/src/cmd/trace/gstate.go
+++ b/src/cmd/trace/gstate.go
@@ -202,13 +202,13 @@ func (gs *gState[R]) syscallEnd(ts trace.Time, blocked bool, ctx *traceContext)
 // to emit a flow event from, indicating explicitly that this goroutine was unblocked by the system.
 func (gs *gState[R]) blockedSyscallEnd(ts trace.Time, stack trace.Stack, ctx *traceContext) {
        name := "exit blocked syscall"
-       gs.setStartCause(ts, name, trace.SyscallP, stack)
+       gs.setStartCause(ts, name, traceviewer.SyscallP, stack)
 
        // Emit an syscall exit instant event for the "Syscall" lane.
        ctx.Instant(traceviewer.InstantEvent{
                Name:     name,
                Ts:       ctx.elapsed(ts),
-               Resource: trace.SyscallP,
+               Resource: traceviewer.SyscallP,
                Stack:    ctx.Stack(viewerFrames(stack)),
        })
 }
@@ -228,7 +228,7 @@ func (gs *gState[R]) unblock(ts trace.Time, stack trace.Stack, resource R, ctx *
                // TODO(mknyszek): Handle this invalidness in a more general way.
                if _, ok := any(resource).(trace.ThreadID); !ok {
                        // Emit an unblock instant event for the "Network" lane.
-                       viewerResource = trace.NetpollP
+                       viewerResource = traceviewer.NetpollP
                }
                ctx.Instant(traceviewer.InstantEvent{
                        Name:     name,

diff --git a/src/cmd/trace/jsontrace_test.go b/src/cmd/trace/jsontrace_test.go
index 5f89b275dca197b5d70867c459b2528cecf69b9f..c9df45040f7d17a21c71bd4489122f232e1f0a32 100644 (file)
--- a/src/cmd/trace/jsontrace_test.go
+++ b/src/cmd/trace/jsontrace_test.go
@@ -7,7 +7,6 @@ package main
 import (
        "bytes"
        "encoding/json"
-       "internal/trace"
        "io"
        "net/http/httptest"
        "os"
@@ -19,6 +18,7 @@ import (
        "time"
 
        "internal/trace/raw"
+       "internal/trace/traceviewer"
        "internal/trace/traceviewer/format"
 )
 
@@ -159,7 +159,7 @@ func checkNetworkUnblock(t *testing.T, data format.Data) {
        count := 0
        var netBlockEv *format.Event
        for _, e := range data.Events {
-               if e.TID == trace.NetpollP && e.Name == "unblock (network)" && e.Phase == "I" && e.Scope == "t" {
+               if e.TID == traceviewer.NetpollP && e.Name == "unblock (network)" && e.Phase == "I" && e.Scope == "t" {
                        count++
                        netBlockEv = e
                }

diff --git a/src/internal/trace/traceviewer/emitter.go b/src/internal/trace/traceviewer/emitter.go
index d2227d681e79436847fdd19caa5ff7014702fde1..9167ff81b45f8380e81c5c8158e17f06e341b80c 100644 (file)
--- a/src/internal/trace/traceviewer/emitter.go
+++ b/src/internal/trace/traceviewer/emitter.go
@@ -632,10 +632,10 @@ func (e *Emitter) Flush() {
 
        e.processMeta(format.ProcsSection, e.resourceType, 2)
 
-       e.threadMeta(format.ProcsSection, trace.GCP, "GC", -6)
-       e.threadMeta(format.ProcsSection, trace.NetpollP, "Network", -5)
-       e.threadMeta(format.ProcsSection, trace.TimerP, "Timers", -4)
-       e.threadMeta(format.ProcsSection, trace.SyscallP, "Syscalls", -3)
+       e.threadMeta(format.ProcsSection, GCP, "GC", -6)
+       e.threadMeta(format.ProcsSection, NetpollP, "Network", -5)
+       e.threadMeta(format.ProcsSection, TimerP, "Timers", -4)
+       e.threadMeta(format.ProcsSection, SyscallP, "Syscalls", -3)
 
        for id, name := range e.resources {
                priority := int(id)

diff --git a/src/internal/trace/fakep.go b/src/internal/trace/traceviewer/fakep.go
similarity index 95%
rename from src/internal/trace/fakep.go
rename to src/internal/trace/traceviewer/fakep.go
index 8d580c3a3aa2852593c164f4f1d3388c419b2456..655938b213bc361855960463709f43c139767cef 100644 (file)
--- a/src/internal/trace/fakep.go
+++ b/src/internal/trace/traceviewer/fakep.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package trace
+package traceviewer
 
 const (
        // Special P identifiers: