diff options
| author | Russ Cox <rsc@golang.org> | 2014-09-04 15:53:45 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-09-04 15:53:45 -0400 |
| commit | f545b05aaec2d13e664ce48ce2c258bcfce307c4 (patch) | |
| tree | b3765343ac5e3089a6bca40974cb6d46d78da013 /src/pkg/runtime/os_linux.c | |
| parent | c08d8834ddf8d69daba989a4ee0b5e144fce973d (diff) | |
| download | go-f545b05aaec2d13e664ce48ce2c258bcfce307c4.tar.xz | |
runtime: make more functions safe for Go
Convert no-op race functions.
Everything else is tiny and gets NOSPLITs.
After this, all that is left on darwin is sysAlloc, panic, and gothrow (all pending).
There may be system-specific calls in other builds.
LGTM=iant
R=golang-codereviews, iant
CC=dvyukov, golang-codereviews, khr, r
https://golang.org/cl/140240044
Diffstat (limited to 'src/pkg/runtime/os_linux.c')
| -rw-r--r-- | src/pkg/runtime/os_linux.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/pkg/runtime/os_linux.c b/src/pkg/runtime/os_linux.c index 34521cc86a..7ab4858d9a 100644 --- a/src/pkg/runtime/os_linux.c +++ b/src/pkg/runtime/os_linux.c @@ -55,24 +55,44 @@ runtime·futexsleep(uint32 *addr, uint32 val, int64 ns) runtime·futex(addr, FUTEX_WAIT, val, &ts, nil, 0); } +static void badfutexwakeup(void); + // If any procs are sleeping on addr, wake up at most cnt. +#pragma textflag NOSPLIT void runtime·futexwakeup(uint32 *addr, uint32 cnt) { int64 ret; + void (*fn)(void); ret = runtime·futex(addr, FUTEX_WAKE, cnt, nil, nil, 0); - if(ret >= 0) return; // I don't know that futex wakeup can return // EAGAIN or EINTR, but if it does, it would be // safe to loop and call futex again. - runtime·printf("futexwakeup addr=%p returned %D\n", addr, ret); + g->m->ptrarg[0] = addr; + g->m->scalararg[0] = (int32)ret; // truncated but fine + fn = badfutexwakeup; + if(g == g->m->gsignal) + fn(); + else + runtime·onM(&fn); *(int32*)0x1006 = 0x1006; } +static void +badfutexwakeup(void) +{ + void *addr; + int64 ret; + + addr = g->m->ptrarg[0]; + ret = (int32)g->m->scalararg[0]; + runtime·printf("futexwakeup addr=%p returned %D\n", addr, ret); +} + extern runtime·sched_getaffinity(uintptr pid, uintptr len, uintptr *buf); static int32 getproccount(void) @@ -162,6 +182,7 @@ runtime·osinit(void) byte* runtime·startup_random_data; uint32 runtime·startup_random_data_len; +#pragma textflag NOSPLIT void runtime·get_random_data(byte **rnd, int32 *rnd_len) { |