mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-07-04 18:28:30 +00:00
Make garbage collection thread safe
- You can now use _gc(malloc()) in multithreaded programs - This change fixes a bug where fork() on NT disabled TLS - Fixed TLS code morphing on XNU/NT, for R8-R15 registers
This commit is contained in:
Justine Tunney
parent
571c2c3c69
commit
0e2b1bfeed
37 changed files with 310 additions and 189 deletions
|
|
@ -37,6 +37,8 @@
|
|||
#include "libc/mem/alg.h"
|
||||
#include "libc/mem/bisectcarleft.internal.h"
|
||||
#include "libc/nexgen32e/gc.internal.h"
|
||||
#include "libc/nexgen32e/gettls.h"
|
||||
#include "libc/nexgen32e/threaded.h"
|
||||
#include "libc/runtime/gc.internal.h"
|
||||
#include "libc/runtime/runtime.h"
|
||||
#include "libc/runtime/stack.h"
|
||||
|
|
@ -47,6 +49,7 @@
|
|||
#include "libc/sysv/consts/fileno.h"
|
||||
#include "libc/sysv/consts/o.h"
|
||||
#include "libc/sysv/consts/sig.h"
|
||||
#include "libc/thread/thread.h"
|
||||
#include "libc/x/x.h"
|
||||
|
||||
#define kBacktraceMaxFrames 128
|
||||
|
|
@ -106,7 +109,7 @@ static int PrintBacktraceUsingAddr2line(int fd, const struct StackFrame *bp) {
|
|||
argv[i++] = "-a"; /* filter out w/ shell script wrapper for old versions */
|
||||
argv[i++] = "-pCife";
|
||||
argv[i++] = debugbin;
|
||||
garbage = weaken(__garbage);
|
||||
garbage = __tls_enabled ? ((cthread_t)__get_tls())->garbages : 0;
|
||||
gi = garbage ? garbage->i : 0;
|
||||
for (frame = bp; frame && i < kBacktraceMaxFrames - 1; frame = frame->next) {
|
||||
addr = frame->addr;
|
||||
|
|
|
|||
|
|
@ -16,21 +16,24 @@
|
|||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/mem/bisectcarleft.internal.h"
|
||||
#include "libc/assert.h"
|
||||
#include "libc/intrin/weaken.h"
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/fmt/fmt.h"
|
||||
#include "libc/fmt/itoa.h"
|
||||
#include "libc/intrin/kprintf.h"
|
||||
#include "libc/intrin/weaken.h"
|
||||
#include "libc/log/backtrace.internal.h"
|
||||
#include "libc/macros.internal.h"
|
||||
#include "libc/mem/bisectcarleft.internal.h"
|
||||
#include "libc/nexgen32e/gc.internal.h"
|
||||
#include "libc/nexgen32e/gettls.h"
|
||||
#include "libc/nexgen32e/stackframe.h"
|
||||
#include "libc/nexgen32e/threaded.h"
|
||||
#include "libc/runtime/memtrack.internal.h"
|
||||
#include "libc/runtime/runtime.h"
|
||||
#include "libc/runtime/symbols.internal.h"
|
||||
#include "libc/str/str.h"
|
||||
#include "libc/thread/thread.h"
|
||||
|
||||
#define LIMIT 100
|
||||
|
||||
|
|
@ -54,7 +57,7 @@ noinstrument noasan int PrintBacktraceUsingSymbols(int fd,
|
|||
struct Garbages *garbage;
|
||||
const struct StackFrame *frame;
|
||||
if (!bp) bp = __builtin_frame_address(0);
|
||||
garbage = weaken(__garbage);
|
||||
garbage = __tls_enabled ? ((cthread_t)__get_tls())->garbages : 0;
|
||||
gi = garbage ? garbage->i : 0;
|
||||
for (i = 0, frame = bp; frame; frame = frame->next) {
|
||||
if (++i == LIMIT) {
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ o/$(MODE)/libc/log/watch.o: private \
|
|||
OVERRIDE_CFLAGS += \
|
||||
-ffreestanding
|
||||
|
||||
o/$(MODE)/libc/log/watch.o \
|
||||
o/$(MODE)/libc/log/attachdebugger.o \
|
||||
o/$(MODE)/libc/log/checkaligned.o \
|
||||
o/$(MODE)/libc/log/checkfail.o \
|
||||
|
|
|
|||
|
|
@ -20,8 +20,11 @@
|
|||
#include "libc/intrin/kprintf.h"
|
||||
#include "libc/log/log.h"
|
||||
#include "libc/nexgen32e/gc.internal.h"
|
||||
#include "libc/nexgen32e/gettls.h"
|
||||
#include "libc/nexgen32e/threaded.h"
|
||||
#include "libc/stdio/stdio.h"
|
||||
/* clang-format off */
|
||||
#include "libc/thread/thread.h"
|
||||
// clang-format off
|
||||
|
||||
/**
|
||||
* Prints list of deferred operations on shadow stack.
|
||||
|
|
@ -30,24 +33,25 @@ void PrintGarbage(void) {
|
|||
size_t i;
|
||||
char name[19];
|
||||
const char *symbol;
|
||||
struct Garbages *g;
|
||||
kprintf("\n");
|
||||
kprintf(" SHADOW STACK @ %p\n", __builtin_frame_address(0));
|
||||
kprintf("garbage ent. parent frame original ret callback arg \n");
|
||||
kprintf("------------ ------------ ------------------ ------------------ ------------------\n");
|
||||
if (__garbage.i) {
|
||||
for (i = __garbage.i; i--;) {
|
||||
symbol = __get_symbol_by_addr(__garbage.p[i].ret);
|
||||
if ((g = __tls_enabled ? ((cthread_t)__get_tls())->garbages:0) && g->i) {
|
||||
for (i = g->i; i--;) {
|
||||
symbol = __get_symbol_by_addr(g->p[i].ret);
|
||||
if (symbol) {
|
||||
ksnprintf(name, sizeof(name), "%s", symbol);
|
||||
} else {
|
||||
ksnprintf(name, sizeof(name), "%#014lx", __garbage.p[i].ret);
|
||||
ksnprintf(name, sizeof(name), "%#014lx", g->p[i].ret);
|
||||
}
|
||||
kprintf("%12lx %12lx %18s %18s %#18lx\n",
|
||||
__garbage.p + i,
|
||||
__garbage.p[i].frame,
|
||||
g->p + i,
|
||||
g->p[i].frame,
|
||||
name,
|
||||
__get_symbol_by_addr(__garbage.p[i].fn),
|
||||
__garbage.p[i].arg);
|
||||
__get_symbol_by_addr(g->p[i].fn),
|
||||
g->p[i].arg);
|
||||
}
|
||||
} else {
|
||||
kprintf("%12s %12s %18s %18s %18s\n","empty","-","-","-","-");
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
|
||||
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
|
||||
╞══════════════════════════════════════════════════════════════════════════════╡
|
||||
│ Copyright 2021 Justine Alexandra Roberts Tunney │
|
||||
│ │
|
||||
│ Permission to use, copy, modify, and/or distribute this software for │
|
||||
│ any purpose with or without fee is hereby granted, provided that the │
|
||||
│ above copyright notice and this permission notice appear in all copies. │
|
||||
│ │
|
||||
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
|
||||
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
|
||||
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
|
||||
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
|
||||
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
|
||||
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
|
||||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/log/log.h"
|
||||
#include "libc/nexgen32e/gc.internal.h"
|
||||
#include "libc/stdio/stdio.h"
|
||||
/* clang-format off */
|
||||
|
||||
/**
|
||||
* Prints list of deferred operations on shadow stack w/o symbols.
|
||||
*/
|
||||
void PrintGarbageNumeric(FILE *f) {
|
||||
size_t i;
|
||||
f = stderr;
|
||||
fprintf(f, "\n");
|
||||
fprintf(f, " SHADOW STACK @ 0x%016lx\n", __builtin_frame_address(0));
|
||||
fprintf(f, " garbage entry parent frame original ret callback arg \n");
|
||||
fprintf(f, "-------------- -------------- ------------------ ------------------ ------------------\n");
|
||||
for (i = __garbage.i; i--;) {
|
||||
fprintf(f, "0x%012lx 0x%012lx 0x%016lx 0x%016lx 0x%016lx\n",
|
||||
__garbage.p + i,
|
||||
__garbage.p[i].frame,
|
||||
__garbage.p[i].ret,
|
||||
__garbage.p[i].fn,
|
||||
__garbage.p[i].arg);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue