Skip to content

G
go
Commit 4f334360 authored by Didier Spezia's avatar Didier Spezia Committed by Ian Lance Taylor
Browse files
Options

runtime,internal/trace: map/slice literals janitoring 

Simplify slice/map literal expressions.
Caught with gofmt -d -s, fixed with gofmt -w -s
Checked that the result can still be compiled with Go 1.4.

Change-Id: I06bce110bb5f46ee2f45113681294475aa6968bc
Reviewed-on: https://go-review.googlesource.com/13839Reviewed-by: default avatarAndrew Gerrand <adg@golang.org>
parent 90f69259
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 78 deletions
src/internal/trace/parser.go
View file @ 4f334360
...@@ -479,7 +479,7 @@ func postProcessTrace(events []*Event) error { ...@@ -479,7 +479,7 @@ func postProcessTrace(events []*Event) error {
p.g = ev.G p.g = ev.G
if g.evCreate != nil { if g.evCreate != nil {
// +1 because symbolizer expects return pc. // +1 because symbolizer expects return pc.
ev.Stk = []*Frame{&Frame{PC: g.evCreate.Args[1] + 1}} ev.Stk = []*Frame{{PC: g.evCreate.Args[1] + 1}}
g.evCreate = nil g.evCreate = nil
} }
......
src/runtime/trace/trace_stack_test.go
View file @ 4f334360
...@@ -144,107 +144,107 @@ func TestTraceSymbolize(t *testing.T) { ...@@ -144,107 +144,107 @@ func TestTraceSymbolize(t *testing.T) {
Stk []frame Stk []frame
} }
want := []eventDesc{ want := []eventDesc{
eventDesc{trace.EvGCStart, []frame{ {trace.EvGCStart, []frame{
frame{"runtime.GC", 0}, {"runtime.GC", 0},
frame{"runtime/trace_test.TestTraceSymbolize", 106}, {"runtime/trace_test.TestTraceSymbolize", 106},
frame{"testing.tRunner", 0}, {"testing.tRunner", 0},
}}, }},
eventDesc{trace.EvGoSched, []frame{ {trace.EvGoSched, []frame{
frame{"runtime/trace_test.TestTraceSymbolize", 107}, {"runtime/trace_test.TestTraceSymbolize", 107},
frame{"testing.tRunner", 0}, {"testing.tRunner", 0},
}}, }},
eventDesc{trace.EvGoCreate, []frame{ {trace.EvGoCreate, []frame{
frame{"runtime/trace_test.TestTraceSymbolize", 39}, {"runtime/trace_test.TestTraceSymbolize", 39},
frame{"testing.tRunner", 0}, {"testing.tRunner", 0},
}}, }},
eventDesc{trace.EvGoStop, []frame{ {trace.EvGoStop, []frame{
frame{"runtime.block", 0}, {"runtime.block", 0},
frame{"runtime/trace_test.TestTraceSymbolize.func1", 38}, {"runtime/trace_test.TestTraceSymbolize.func1", 38},
}}, }},
eventDesc{trace.EvGoStop, []frame{ {trace.EvGoStop, []frame{
frame{"runtime.chansend1", 0}, {"runtime.chansend1", 0},
frame{"runtime/trace_test.TestTraceSymbolize.func2", 42}, {"runtime/trace_test.TestTraceSymbolize.func2", 42},
}}, }},
eventDesc{trace.EvGoStop, []frame{ {trace.EvGoStop, []frame{
frame{"runtime.chanrecv1", 0}, {"runtime.chanrecv1", 0},
frame{"runtime/trace_test.TestTraceSymbolize.func3", 46}, {"runtime/trace_test.TestTraceSymbolize.func3", 46},
}}, }},
eventDesc{trace.EvGoBlockRecv, []frame{ {trace.EvGoBlockRecv, []frame{
frame{"runtime.chanrecv1", 0}, {"runtime.chanrecv1", 0},
frame{"runtime/trace_test.TestTraceSymbolize.func4", 50}, {"runtime/trace_test.TestTraceSymbolize.func4", 50},
}}, }},
eventDesc{trace.EvGoUnblock, []frame{ {trace.EvGoUnblock, []frame{
frame{"runtime.chansend1", 0}, {"runtime.chansend1", 0},
frame{"runtime/trace_test.TestTraceSymbolize", 109}, {"runtime/trace_test.TestTraceSymbolize", 109},
frame{"testing.tRunner", 0}, {"testing.tRunner", 0},
}}, }},
eventDesc{trace.EvGoBlockSend, []frame{ {trace.EvGoBlockSend, []frame{
frame{"runtime.chansend1", 0}, {"runtime.chansend1", 0},
frame{"runtime/trace_test.TestTraceSymbolize.func5", 54}, {"runtime/trace_test.TestTraceSymbolize.func5", 54},
}}, }},
eventDesc{trace.EvGoUnblock, []frame{ {trace.EvGoUnblock, []frame{
frame{"runtime.chanrecv1", 0}, {"runtime.chanrecv1", 0},
frame{"runtime/trace_test.TestTraceSymbolize", 110}, {"runtime/trace_test.TestTraceSymbolize", 110},
frame{"testing.tRunner", 0}, {"testing.tRunner", 0},
}}, }},
eventDesc{trace.EvGoBlockSelect, []frame{ {trace.EvGoBlockSelect, []frame{
frame{"runtime.selectgo", 0}, {"runtime.selectgo", 0},
frame{"runtime/trace_test.TestTraceSymbolize.func6", 59}, {"runtime/trace_test.TestTraceSymbolize.func6", 59},
}}, }},
eventDesc{trace.EvGoUnblock, []frame{ {trace.EvGoUnblock, []frame{
frame{"runtime.selectgo", 0}, {"runtime.selectgo", 0},
frame{"runtime/trace_test.TestTraceSymbolize", 111}, {"runtime/trace_test.TestTraceSymbolize", 111},
frame{"testing.tRunner", 0}, {"testing.tRunner", 0},
}}, }},
eventDesc{trace.EvGoBlockSync, []frame{ {trace.EvGoBlockSync, []frame{
frame{"sync.(*Mutex).Lock", 0}, {"sync.(*Mutex).Lock", 0},
frame{"runtime/trace_test.TestTraceSymbolize.func7", 67}, {"runtime/trace_test.TestTraceSymbolize.func7", 67},
}}, }},
eventDesc{trace.EvGoUnblock, []frame{ {trace.EvGoUnblock, []frame{
frame{"sync.(*Mutex).Unlock", 0}, {"sync.(*Mutex).Unlock", 0},
frame{"runtime/trace_test.TestTraceSymbolize", 115}, {"runtime/trace_test.TestTraceSymbolize", 115},
frame{"testing.tRunner", 0}, {"testing.tRunner", 0},
}}, }},
eventDesc{trace.EvGoBlockSync, []frame{ {trace.EvGoBlockSync, []frame{
frame{"sync.(*WaitGroup).Wait", 0}, {"sync.(*WaitGroup).Wait", 0},
frame{"runtime/trace_test.TestTraceSymbolize.func8", 73}, {"runtime/trace_test.TestTraceSymbolize.func8", 73},
}}, }},
eventDesc{trace.EvGoUnblock, []frame{ {trace.EvGoUnblock, []frame{
frame{"sync.(*WaitGroup).Add", 0}, {"sync.(*WaitGroup).Add", 0},
frame{"sync.(*WaitGroup).Done", 0}, {"sync.(*WaitGroup).Done", 0},
frame{"runtime/trace_test.TestTraceSymbolize", 116}, {"runtime/trace_test.TestTraceSymbolize", 116},
frame{"testing.tRunner", 0}, {"testing.tRunner", 0},
}}, }},
eventDesc{trace.EvGoBlockCond, []frame{ {trace.EvGoBlockCond, []frame{
frame{"sync.(*Cond).Wait", 0}, {"sync.(*Cond).Wait", 0},
frame{"runtime/trace_test.TestTraceSymbolize.func9", 78}, {"runtime/trace_test.TestTraceSymbolize.func9", 78},
}}, }},
eventDesc{trace.EvGoUnblock, []frame{ {trace.EvGoUnblock, []frame{
frame{"sync.(*Cond).Signal", 0}, {"sync.(*Cond).Signal", 0},
frame{"runtime/trace_test.TestTraceSymbolize", 117}, {"runtime/trace_test.TestTraceSymbolize", 117},
frame{"testing.tRunner", 0}, {"testing.tRunner", 0},
}}, }},
eventDesc{trace.EvGoSleep, []frame{ {trace.EvGoSleep, []frame{
frame{"time.Sleep", 0}, {"time.Sleep", 0},
frame{"runtime/trace_test.TestTraceSymbolize", 108}, {"runtime/trace_test.TestTraceSymbolize", 108},
frame{"testing.tRunner", 0}, {"testing.tRunner", 0},
}}, }},
} }
// Stacks for the following events are OS-dependent due to OS-specific code in net package. // Stacks for the following events are OS-dependent due to OS-specific code in net package.
if runtime.GOOS != "windows" && runtime.GOOS != "plan9" { if runtime.GOOS != "windows" && runtime.GOOS != "plan9" {
want = append(want, []eventDesc{ want = append(want, []eventDesc{
eventDesc{trace.EvGoBlockNet, []frame{ {trace.EvGoBlockNet, []frame{
frame{"net.(*netFD).accept", 0}, {"net.(*netFD).accept", 0},
frame{"net.(*TCPListener).AcceptTCP", 0}, {"net.(*TCPListener).AcceptTCP", 0},
frame{"net.(*TCPListener).Accept", 0}, {"net.(*TCPListener).Accept", 0},
frame{"runtime/trace_test.TestTraceSymbolize.func10", 86}, {"runtime/trace_test.TestTraceSymbolize.func10", 86},
}}, }},
eventDesc{trace.EvGoSysCall, []frame{ {trace.EvGoSysCall, []frame{
frame{"syscall.read", 0}, {"syscall.read", 0},
frame{"syscall.Read", 0}, {"syscall.Read", 0},
frame{"os.(*File).read", 0}, {"os.(*File).read", 0},
frame{"os.(*File).Read", 0}, {"os.(*File).Read", 0},
frame{"runtime/trace_test.TestTraceSymbolize.func11", 101}, {"runtime/trace_test.TestTraceSymbolize.func11", 101},
}}, }},
}...) }...)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7