projects
/
oweals
/
musl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 864c7d7a6661e160e4bf652220c08ea3401c6325..11286ef44e3bd5fd1069087f8741e5e0ff3fdcf0 100644
(file)
--- a/
src/process/fork.c
+++ b/
src/process/fork.c
@@
-1,5
+1,6
@@
#include <unistd.h>
#include <string.h>
#include <unistd.h>
#include <string.h>
+#include <signal.h>
#include "syscall.h"
#include "libc.h"
#include "pthread_impl.h"
#include "syscall.h"
#include "libc.h"
#include "pthread_impl.h"
@@
-16,14
+17,20
@@
pid_t fork(void)
sigset_t set;
__fork_handler(-1);
__block_all_sigs(&set);
sigset_t set;
__fork_handler(-1);
__block_all_sigs(&set);
- ret = syscall(SYS_fork);
- if (libc.has_thread_pointer && !ret) {
+#ifdef SYS_fork
+ ret = __syscall(SYS_fork);
+#else
+ ret = __syscall(SYS_clone, SIGCHLD, 0);
+#endif
+ if (!ret) {
pthread_t self = __pthread_self();
pthread_t self = __pthread_self();
- self->tid = self->pid = __syscall(SYS_getpid);
- memset(&self->robust_list, 0, sizeof self->robust_list);
+ 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;
}
__restore_sigs(&set);
__fork_handler(!ret);
libc.threads_minus_1 = 0;
}
__restore_sigs(&set);
__fork_handler(!ret);
- return
ret
;
+ return
__syscall_ret(ret)
;
}
}