diff options
| author | Michael Anthony Knyszek <mknyszek@google.com> | 2023-11-12 23:27:31 +0000 |
|---|---|---|
| committer | Michael Knyszek <mknyszek@google.com> | 2023-11-21 21:27:53 +0000 |
| commit | ff07b73faced25076548b8d916ff19de1844650a (patch) | |
| tree | 36e8928ea4af5e95797b8194185cfb9d200e82c7 /src/cmd/trace | |
| parent | c785be4c6ac8f042e91d7333862737078831ece4 (diff) | |
| download | go-ff07b73faced25076548b8d916ff19de1844650a.tar.xz | |
internal/trace/traceviewer: make the mmu handler more self-contained
The last change made the MMU rendering code common and introduced a new
API, but it was kind of messy. Part of the problem was that some of the
Javascript in the template for the main page referred to specific
endpoints on the server.
Fix this by having the Javascript access the same endpoint but with a
different query variable. Now the Javascript code doesn't depend on
specific endpoints, just on query variables for the current endpoint.
For #60773.
For #63960.
Change-Id: I1c559d9859c3a0d62e2094c9d4ab117890b63b31
Reviewed-on: https://go-review.googlesource.com/c/go/+/541259
Auto-Submit: Michael Knyszek <mknyszek@google.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Diffstat (limited to 'src/cmd/trace')
| -rw-r--r-- | src/cmd/trace/main.go | 4 | ||||
| -rw-r--r-- | src/cmd/trace/v2/main.go | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/cmd/trace/main.go b/src/cmd/trace/main.go index cb39c08aa7..b66980e9ac 100644 --- a/src/cmd/trace/main.go +++ b/src/cmd/trace/main.go @@ -139,8 +139,8 @@ func main() { log.Printf("Opening browser. Trace viewer is listening on %s", addr) browser.Open(addr) - // Install MMU handlers. - traceviewer.InstallMMUHandlers(http.DefaultServeMux, ranges, mutatorUtil) + // Install MMU handler. + http.HandleFunc("/mmu", traceviewer.MMUHandlerFunc(ranges, mutatorUtil)) // Install main handler. http.Handle("/", traceviewer.MainHandler(ranges)) diff --git a/src/cmd/trace/v2/main.go b/src/cmd/trace/v2/main.go index 38be4d2fe2..51b5ebf6cf 100644 --- a/src/cmd/trace/v2/main.go +++ b/src/cmd/trace/v2/main.go @@ -62,6 +62,10 @@ func Main(traceFile, httpAddr, pprof string, debug int) error { log.Printf("Opening browser. Trace viewer is listening on %s", addr) browser.Open(addr) + mutatorUtil := func(flags trace.UtilFlags) ([][]trace.MutatorUtil, error) { + return trace.MutatorUtilizationV2(parsed.events, flags), nil + } + mux := http.NewServeMux() mux.Handle("/", traceviewer.MainHandler(ranges)) mux.Handle("/trace", traceviewer.TraceHandler()) @@ -69,12 +73,7 @@ func Main(traceFile, httpAddr, pprof string, debug int) error { mux.Handle("/static/", traceviewer.StaticHandler()) mux.HandleFunc("/goroutines", GoroutinesHandlerFunc(gSummaries)) mux.HandleFunc("/goroutine", GoroutineHandler(gSummaries)) - - // Install MMU handlers. - mutatorUtil := func(flags trace.UtilFlags) ([][]trace.MutatorUtil, error) { - return trace.MutatorUtilizationV2(parsed.events, flags), nil - } - traceviewer.InstallMMUHandlers(mux, ranges, mutatorUtil) + mux.HandleFunc("/mmu", traceviewer.MMUHandlerFunc(ranges, mutatorUtil)) err = http.Serve(ln, mux) return fmt.Errorf("failed to start http server: %w", err) |