diff options
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) |