diff options
| author | Daniel Martà <mvdan@mvdan.cc> | 2023-04-07 18:53:49 +0100 |
|---|---|---|
| committer | Daniel Martà <mvdan@mvdan.cc> | 2023-10-26 07:37:45 +0000 |
| commit | 5fe2035927bc9fac8a375a96d9ef47735c10fba4 (patch) | |
| tree | 0c225551372e7899fb6e6924d4fc34c89290d471 /src | |
| parent | 555af99bcc6b7515ebad5a3c947f3e4ab147fd29 (diff) | |
| download | go-5fe2035927bc9fac8a375a96d9ef47735c10fba4.tar.xz | |
internal/profile: actually return errors in postDecode
As spotted by staticcheck, the body did keep track of errors by sharing
a single err variable, but its last value was never used as the function
simply finished by returning nil.
To prevent postDecode from erroring on empty profiles,
which breaks TestEmptyProfile, add a check at the top of the function.
Update the runtime/pprof test accordingly,
since the default units didn't make sense for an empty profile anyway.
Change-Id: I188cd8337434adf9169651ab5c914731b8b20f39
Reviewed-on: https://go-review.googlesource.com/c/go/+/483137
Reviewed-by: David Chase <drchase@google.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/internal/profile/encode.go | 5 | ||||
| -rw-r--r-- | src/runtime/pprof/proto_test.go | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/internal/profile/encode.go b/src/internal/profile/encode.go index 77d77f1dfb..72d6fe2fa7 100644 --- a/src/internal/profile/encode.go +++ b/src/internal/profile/encode.go @@ -207,6 +207,9 @@ var profileDecoder = []decoder{ // suffix X) and populates the corresponding exported fields. // The unexported fields are cleared up to facilitate testing. func (p *Profile) postDecode() error { + if p.Empty() { + return nil + } var err error mappings := make(map[uint64]*Mapping) @@ -291,7 +294,7 @@ func (p *Profile) postDecode() error { p.commentX = nil p.DefaultSampleType, err = getString(p.stringTable, &p.defaultSampleTypeX, err) p.stringTable = nil - return nil + return err } func (p *ValueType) decoder() []decoder { diff --git a/src/runtime/pprof/proto_test.go b/src/runtime/pprof/proto_test.go index f788b167da..e1a7f2306d 100644 --- a/src/runtime/pprof/proto_test.go +++ b/src/runtime/pprof/proto_test.go @@ -64,13 +64,9 @@ func TestConvertCPUProfileEmpty(t *testing.T) { } // Expected PeriodType and SampleType. - periodType := &profile.ValueType{Type: "cpu", Unit: "nanoseconds"} - sampleType := []*profile.ValueType{ - {Type: "samples", Unit: "count"}, - {Type: "cpu", Unit: "nanoseconds"}, - } + sampleType := []*profile.ValueType{{}, {}} - checkProfile(t, p, 2000*1000, periodType, sampleType, nil, "") + checkProfile(t, p, 2000*1000, nil, sampleType, nil, "") } func f1() { f1() } |