aboutsummaryrefslogtreecommitdiff
path: root/src/runtime/pprof
diff options
context:
space:
mode:
authorDaniel Martí <mvdan@mvdan.cc>2023-04-07 18:53:49 +0100
committerDaniel Martí <mvdan@mvdan.cc>2023-10-26 07:37:45 +0000
commit5fe2035927bc9fac8a375a96d9ef47735c10fba4 (patch)
tree0c225551372e7899fb6e6924d4fc34c89290d471 /src/runtime/pprof
parent555af99bcc6b7515ebad5a3c947f3e4ab147fd29 (diff)
downloadgo-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/runtime/pprof')
-rw-r--r--src/runtime/pprof/proto_test.go8
1 files changed, 2 insertions, 6 deletions
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() }