aboutsummaryrefslogtreecommitdiff
path: root/src/runtime/debug
diff options
context:
space:
mode:
Diffstat (limited to 'src/runtime/debug')
-rw-r--r--src/runtime/debug/example_monitor_test.go2
-rw-r--r--src/runtime/debug/stack.go9
-rw-r--r--src/runtime/debug/stack_test.go3
3 files changed, 4 insertions, 10 deletions
diff --git a/src/runtime/debug/example_monitor_test.go b/src/runtime/debug/example_monitor_test.go
index 5a1f4e1417..b077e7adb3 100644
--- a/src/runtime/debug/example_monitor_test.go
+++ b/src/runtime/debug/example_monitor_test.go
@@ -91,7 +91,7 @@ func monitor() {
if err != nil {
log.Fatalf("StdinPipe: %v", err)
}
- debug.SetCrashOutput(pipe.(*os.File)) // (this conversion is safe)
+ debug.SetCrashOutput(pipe.(*os.File), debug.CrashOptions{}) // (this conversion is safe)
if err := cmd.Start(); err != nil {
log.Fatalf("can't start monitor: %v", err)
}
diff --git a/src/runtime/debug/stack.go b/src/runtime/debug/stack.go
index dc7dc5d569..d7a860b7dc 100644
--- a/src/runtime/debug/stack.go
+++ b/src/runtime/debug/stack.go
@@ -46,14 +46,7 @@ type CrashOptions struct {
// To disable this additional crash output, call SetCrashOutput(nil).
// If called concurrently with a crash, some in-progress output may be written
// to the old file even after an overriding SetCrashOutput returns.
-//
-// TODO(adonovan): the variadic ... is a short-term measure to avoid
-// breaking the call in x/telemetry; it will be removed before the
-// go1.23 freeze.
-func SetCrashOutput(f *os.File, opts ...CrashOptions) error {
- if len(opts) > 1 {
- panic("supply at most 1 CrashOptions")
- }
+func SetCrashOutput(f *os.File, opts CrashOptions) error {
fd := ^uintptr(0)
if f != nil {
// The runtime will write to this file descriptor from
diff --git a/src/runtime/debug/stack_test.go b/src/runtime/debug/stack_test.go
index 289749ccb4..e1559303f0 100644
--- a/src/runtime/debug/stack_test.go
+++ b/src/runtime/debug/stack_test.go
@@ -13,6 +13,7 @@ import (
"os/exec"
"path/filepath"
"runtime"
+ "runtime/debug"
. "runtime/debug"
"strings"
"testing"
@@ -29,7 +30,7 @@ func TestMain(m *testing.M) {
if err != nil {
log.Fatal(err)
}
- if err := SetCrashOutput(f); err != nil {
+ if err := SetCrashOutput(f, debug.CrashOptions{}); err != nil {
log.Fatal(err) // e.g. EMFILE
}
println("hello")