qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-14 08:40:27 -07:00
Code Releases Activity

runtime: expand error for signal received on non-Go thread.

Browse Source 
We call runtime.findnull dynamically to avoid exceeding the
static nosplit stack limit check.  (Thanks minux!)

Fixes #4048.

R=rsc, minux.ma, ality
CC=golang-dev
https://golang.org/cl/7232066
This commit is contained in:
Alan Donovan 2013-02-14 23:37:14 -05:00 committed by Russ Cox
parent c5b4292eb3
commit e49f945603
5 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pkg/runtime/thread_darwin.c
View File

@ -497,7 +497,7 @@ runtime·badcallback(void)
runtime·write(2, badcallback, sizeof badcallback - 1); 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. // This runs on a foreign stack, without an m or a g. No stack split.
#pragma textflag 7 #pragma textflag 7
@ -508,5 +508,11 @@ runtime·badsignal(int32 sig)
return; // Ignore SIGPROFs intended for a non-Go thread. return; // Ignore SIGPROFs intended for a non-Go thread.
} }
runtime·write(2, badsignal, sizeof badsignal - 1); 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); runtime·exit(1);
} }

8
src/pkg/runtime/thread_freebsd.c
View File

@ -206,7 +206,7 @@ runtime·badcallback(void)
runtime·write(2, badcallback, sizeof badcallback - 1); 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. // This runs on a foreign stack, without an m or a g. No stack split.
#pragma textflag 7 #pragma textflag 7
@ -217,5 +217,11 @@ runtime·badsignal(int32 sig)
return; // Ignore SIGPROFs intended for a non-Go thread. return; // Ignore SIGPROFs intended for a non-Go thread.
} }
runtime·write(2, badsignal, sizeof badsignal - 1); 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); runtime·exit(1);
} }

8
src/pkg/runtime/thread_linux.c
View File

@ -256,7 +256,7 @@ runtime·badcallback(void)
runtime·write(2, badcallback, sizeof badcallback - 1); 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. // This runs on a foreign stack, without an m or a g. No stack split.
#pragma textflag 7 #pragma textflag 7
@ -267,5 +267,11 @@ runtime·badsignal(int32 sig)
return; // Ignore SIGPROFs intended for a non-Go thread. return; // Ignore SIGPROFs intended for a non-Go thread.
} }
runtime·write(2, badsignal, sizeof badsignal - 1); 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); runtime·exit(1);
} }

8
src/pkg/runtime/thread_netbsd.c
View File

@ -252,7 +252,7 @@ runtime·badcallback(void)
runtime·write(2, badcallback, sizeof badcallback - 1); 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. // This runs on a foreign stack, without an m or a g. No stack split.
#pragma textflag 7 #pragma textflag 7
@ -263,5 +263,11 @@ runtime·badsignal(int32 sig)
return; // Ignore SIGPROFs intended for a non-Go thread. return; // Ignore SIGPROFs intended for a non-Go thread.
} }
runtime·write(2, badsignal, sizeof badsignal - 1); 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); runtime·exit(1);
} }

8
src/pkg/runtime/thread_openbsd.c
View File

@ -229,7 +229,7 @@ runtime·badcallback(void)
runtime·write(2, badcallback, sizeof badcallback - 1); 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. // This runs on a foreign stack, without an m or a g. No stack split.
#pragma textflag 7 #pragma textflag 7
@ -240,5 +240,11 @@ runtime·badsignal(int32 sig)
return; // Ignore SIGPROFs intended for a non-Go thread. return; // Ignore SIGPROFs intended for a non-Go thread.
} }
runtime·write(2, badsignal, sizeof badsignal - 1); 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); runtime·exit(1);
} }