aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTulir Asokan <tulir@maunium.net>2019-06-15 19:10:18 +0300
committerTulir Asokan <tulir@maunium.net>2019-06-15 19:10:18 +0300
commit6bb932212cbadac6eed59ac153ebe041523f7570 (patch)
tree1b4fc5a0c9bb070ec8332e460f6fb301149ee64f
parentef509eb3082e4017284345b195ce0489c90a993d (diff)
Add call trace command
-rw-r--r--matrix/rooms/room.go2
-rw-r--r--ui/command-processor.go1
-rw-r--r--ui/commands.go57
3 files changed, 30 insertions, 30 deletions
diff --git a/matrix/rooms/room.go b/matrix/rooms/room.go
index ec8b0d9..a0918b1 100644
--- a/matrix/rooms/room.go
+++ b/matrix/rooms/room.go
@@ -34,8 +34,6 @@ import (
func init() {
gob.Register(map[string]interface{}{})
gob.Register([]interface{}{})
- gob.Register(&Room{})
- gob.Register(0)
}
type RoomNameSource int
diff --git a/ui/command-processor.go b/ui/command-processor.go
index 65b704f..26644c5 100644
--- a/ui/command-processor.go
+++ b/ui/command-processor.go
@@ -109,6 +109,7 @@ func NewCommandProcessor(parent *MainView) *CommandProcessor {
"invite": cmdInvite,
"hprof": cmdHeapProfile,
"cprof": cmdCPUProfile,
+ "trace": cmdTrace,
},
}
}
diff --git a/ui/commands.go b/ui/commands.go
index 5d92969..ab02735 100644
--- a/ui/commands.go
+++ b/ui/commands.go
@@ -19,10 +19,12 @@ package ui
import (
"encoding/json"
"fmt"
+ "io"
"os"
"runtime"
dbg "runtime/debug"
"runtime/pprof"
+ "runtime/trace"
"strconv"
"strings"
"time"
@@ -92,38 +94,37 @@ func cmdHeapProfile(cmd *Command) {
}
}
-func cmdCPUProfile(cmd *Command) {
+func runTimedProfile(cmd *Command, start func(writer io.Writer) error, stop func(), task, file string) {
if len(cmd.Args) == 0 {
- cmd.Reply("Usage: /cprof <seconds>")
- return
- }
- dur, err := strconv.Atoi(cmd.Args[0])
- if err != nil || dur < 0 {
- cmd.Reply("Usage: /cprof <seconds>")
- return
- }
- cpuProfile, err := os.Create("gomuks.cpu.prof")
- if err != nil {
- debug.Print("Failed to open gomuks.cpu.prof:", err)
- return
- }
- err = pprof.StartCPUProfile(cpuProfile)
- if err != nil {
+ cmd.Reply("Usage: /%s <seconds>", cmd.Command)
+ } else if dur, err := strconv.Atoi(cmd.Args[0]); err != nil || dur < 0 {
+ cmd.Reply("Usage: /%s <seconds>", cmd.Command)
+ } else if cpuProfile, err := os.Create(file); err != nil {
+ debug.Printf("Failed to open %s: %v", file, err)
+ } else if err = start(cpuProfile); err != nil {
_ = cpuProfile.Close()
- debug.Print("CPU profile error:", err)
- return
+ debug.Print(task, "error:", err)
+ } else {
+ cmd.Reply("Started %s for %d seconds", task, dur)
+ go func() {
+ time.Sleep(time.Duration(dur) * time.Second)
+ stop()
+ cmd.Reply("%s finished.", task)
+
+ err := cpuProfile.Close()
+ if err != nil {
+ debug.Print("Failed to close gomuks.cpu.prof:", err)
+ }
+ }()
}
- cmd.Reply("Started CPU profiling for %d seconds", dur)
- go func() {
- time.Sleep(time.Duration(dur) * time.Second)
- pprof.StopCPUProfile()
- cmd.Reply("CPU profiling finished.")
+}
- err := cpuProfile.Close()
- if err != nil {
- debug.Print("Failed to close gomuks.cpu.prof:", err)
- }
- }()
+func cmdCPUProfile(cmd *Command) {
+ runTimedProfile(cmd, pprof.StartCPUProfile, pprof.StopCPUProfile, "CPU profiling", "gomuks.cpu.prof")
+}
+
+func cmdTrace(cmd *Command) {
+ runTimedProfile(cmd, trace.Start, trace.Stop, "Call tracing", "gomuks.trace")
}
// TODO this command definitely belongs in a plugin once we have a plugin system.