track all live threads in an AS-safe, fully-consistent linked list

[oweals/musl.git] / src / process / fork.c

diff --git a/src/process/fork.c b/src/process/fork.c
index 87e7dc96790b3e150c439034b1235d9d105fc54f..11286ef44e3bd5fd1069087f8741e5e0ff3fdcf0 100644 (file)
--- a/src/process/fork.c
+++ b/src/process/fork.c
@@ -1,19 +1,36 @@
 #include <unistd.h>
+#include <string.h>
+#include <signal.h>
 #include "syscall.h"
 #include "libc.h"
 #include "pthread_impl.h"
 
+static void dummy(int x)
+{
+}
+
+weak_alias(dummy, __fork_handler);
+
 pid_t fork(void)
 {
        pid_t ret;
-       if (libc.fork_handler) libc.fork_handler(-1);
-       ret = syscall0(__NR_fork);
-       if (libc.lock && !ret) {
+       sigset_t set;
+       __fork_handler(-1);
+       __block_all_sigs(&set);
+#ifdef SYS_fork
+       ret = __syscall(SYS_fork);
+#else
+       ret = __syscall(SYS_clone, SIGCHLD, 0);
+#endif
+       if (!ret) {
                pthread_t self = __pthread_self();
-               self->pid = syscall0(__NR_getpid);
-               self->tid = syscall0(__NR_gettid);
+               self->tid = __syscall(SYS_gettid);
+               self->robust_list.off = 0;
+               self->robust_list.pending = 0;
+               self->next = self->prev = self;
                libc.threads_minus_1 = 0;
        }
-       if (libc.fork_handler) libc.fork_handler(!ret);
-       return ret;
+       __restore_sigs(&set);
+       __fork_handler(!ret);
+       return __syscall_ret(ret);
 }