From f42fb9962b7e786587c1772a73a2bdcfc8a797e7 Mon Sep 17 00:00:00 2001 From: Alan Donovan Date: Thu, 14 Feb 2013 23:37:14 -0500 Subject: runtime: expand error for signal received on non-Go thread. We call runtime.findnull dynamically to avoid exceeding the static nosplit stack limit check. (Thanks minux!) Fixes issue 4048. R=rsc, minux.ma, ality CC=golang-dev https://codereview.appspot.com/7232066 Committer: Russ Cox --- src/pkg/runtime/thread_netbsd.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/pkg/runtime/thread_netbsd.c') diff --git a/src/pkg/runtime/thread_netbsd.c b/src/pkg/runtime/thread_netbsd.c index 4d174a537..cf66d9c79 100644 --- a/src/pkg/runtime/thread_netbsd.c +++ b/src/pkg/runtime/thread_netbsd.c @@ -252,7 +252,7 @@ runtime·badcallback(void) runtime·write(2, badcallback, sizeof badcallback - 1); } -static int8 badsignal[] = "runtime: signal received on thread not created by Go.\n"; +static int8 badsignal[] = "runtime: signal received on thread not created by Go: "; // This runs on a foreign stack, without an m or a g. No stack split. #pragma textflag 7 @@ -263,5 +263,11 @@ runtime·badsignal(int32 sig) return; // Ignore SIGPROFs intended for a non-Go thread. } runtime·write(2, badsignal, sizeof badsignal - 1); + if (0 <= sig && sig < NSIG) { + // Call runtime·findnull dynamically to circumvent static stack size check. + static int32 (*findnull)(byte*) = runtime·findnull; + runtime·write(2, runtime·sigtab[sig].name, findnull((byte*)runtime·sigtab[sig].name)); + } + runtime·write(2, "\n", 1); runtime·exit(1); } -- cgit v1.2.1