mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-08-05 17:30:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix child processes not being able to open files, initialize all necessary locks on fork

Browse source
This commit is contained in:
Gavin Hayes 2024-04-11 23:11:42 -04:00
parent 2721ad46ea
commit 4b39d15d16
4 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libc/intrin/pthreadlock.c
View file

@ -20,6 +20,10 @@
pthread_spinlock_t _pthread_lock_obj; pthread_spinlock_t _pthread_lock_obj;
void _pthread_init(void) {
(void)pthread_spin_init(&_pthread_lock_obj, 0);
}
void _pthread_lock(void) { void _pthread_lock(void) {
pthread_spin_lock(&_pthread_lock_obj); pthread_spin_lock(&_pthread_lock_obj);
} }

20
libc/proc/fork.c
View file

@ -46,6 +46,7 @@ static void _onfork_prepare(void) {
if (_weaken(_pthread_onfork_prepare)) { if (_weaken(_pthread_onfork_prepare)) {
_weaken(_pthread_onfork_prepare)(); _weaken(_pthread_onfork_prepare)();
} }
_pthread_lock();
__fds_lock(); __fds_lock();
__mmi_lock(); __mmi_lock();
} }
@ -53,11 +54,26 @@ static void _onfork_prepare(void) {
static void _onfork_parent(void) { static void _onfork_parent(void) {
__mmi_unlock(); __mmi_unlock();
__fds_unlock(); __fds_unlock();
_pthread_unlock();
if (_weaken(_pthread_onfork_parent)) { if (_weaken(_pthread_onfork_parent)) {
_weaken(_pthread_onfork_parent)(); _weaken(_pthread_onfork_parent)();
} }
} }
static void _onfork_child(void) {
pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
extern pthread_mutex_t __mmi_lock_obj;
pthread_mutex_init(&__mmi_lock_obj, &attr);
pthread_mutex_init(&__fds_lock_obj, &attr);
pthread_mutexattr_destroy(&attr);
_pthread_init();
if (_weaken(_pthread_onfork_child)) {
_weaken(_pthread_onfork_child)();
}
}
int _fork(uint32_t dwCreationFlags) { int _fork(uint32_t dwCreationFlags) {
struct Dll *e; struct Dll *e;
int ax, dx, tid, parent; int ax, dx, tid, parent;
@ -117,8 +133,8 @@ int _fork(uint32_t dwCreationFlags) {
atomic_store_explicit(&pt->pt_canceled, false, memory_order_relaxed); atomic_store_explicit(&pt->pt_canceled, false, memory_order_relaxed);
// run user fork callbacks // run user fork callbacks
if (__threaded && _weaken(_pthread_onfork_child)) { if (__threaded) {
_weaken(_pthread_onfork_child)(); _onfork_child();
} }
STRACE("fork() → 0 (child of %d)", parent); STRACE("fork() → 0 (child of %d)", parent);
} else { } else {

1
libc/thread/posixthread.internal.h
View file

@ -105,6 +105,7 @@ intptr_t _pthread_syshand(struct PosixThread *) libcesque;
long _pthread_cancel_ack(void) libcesque; long _pthread_cancel_ack(void) libcesque;
void _pthread_decimate(void) libcesque; void _pthread_decimate(void) libcesque;
void _pthread_free(struct PosixThread *, bool) libcesque; void _pthread_free(struct PosixThread *, bool) libcesque;
void _pthread_init(void) libcesque;
void _pthread_lock(void) libcesque; void _pthread_lock(void) libcesque;
void _pthread_onfork_child(void) libcesque; void _pthread_onfork_child(void) libcesque;
void _pthread_onfork_parent(void) libcesque; void _pthread_onfork_parent(void) libcesque;

12
libc/thread/pthread_atfork.c
View file

@ -46,8 +46,6 @@ static struct AtForks {
atomic_int allocated; atomic_int allocated;
} _atforks; } _atforks;
extern pthread_spinlock_t _pthread_lock_obj;
static void _pthread_onfork(int i) { static void _pthread_onfork(int i) {
struct AtFork *a; struct AtFork *a;
unassert(0 <= i && i <= 2); unassert(0 <= i && i <= 2);
@ -64,23 +62,13 @@ static void _pthread_onfork(int i) {
void _pthread_onfork_prepare(void) { void _pthread_onfork_prepare(void) {
_pthread_onfork(0); _pthread_onfork(0);
_pthread_lock();
} }
void _pthread_onfork_parent(void) { void _pthread_onfork_parent(void) {
_pthread_unlock();
_pthread_onfork(1); _pthread_onfork(1);
} }
void _pthread_onfork_child(void) { void _pthread_onfork_child(void) {
pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
extern pthread_mutex_t __mmi_lock_obj;
pthread_mutex_init(&__mmi_lock_obj, &attr);
pthread_mutex_init(&__fds_lock_obj, &attr);
pthread_mutexattr_destroy(&attr);
(void)pthread_spin_init(&_pthread_lock_obj, 0);
_pthread_onfork(2); _pthread_onfork(2);
} }