about summary refs log tree commit diff
path: root/src/process
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-04-20 21:41:45 -0400
committerRich Felker <dalias@aerifal.cx>2011-04-20 21:41:45 -0400
commit870cc679771f776333953b2a990a107393d9d0fd (patch)
tree45b6de4ba1170de4654b23d62bd1c6a38220e112 /src/process
parentf9a6372a98cc4d1b70400b2e7238e1f9eae50558 (diff)
downloadmusl-870cc679771f776333953b2a990a107393d9d0fd.tar.gz
musl-870cc679771f776333953b2a990a107393d9d0fd.tar.xz
musl-870cc679771f776333953b2a990a107393d9d0fd.zip
fix minor bugs due to incorrect threaded-predicate semantics
some functions that should have been testing whether pthread_self()
had been called and initialized the thread pointer were instead
testing whether pthread_create() had been called and actually made the
program "threaded". while it's unlikely any mismatch would occur in
real-world problems, this could have introduced subtle bugs. now, we
store the address of the main thread's thread descriptor in the libc
structure and use its presence as a flag that the thread register is
initialized. note that after fork, the calling thread (not necessarily
the original main thread) is the new main thread.
Diffstat (limited to 'src/process')
-rw-r--r--src/process/fork.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/process/fork.c b/src/process/fork.c
index bcd47c97..a04e8929 100644
--- a/src/process/fork.c
+++ b/src/process/fork.c
@@ -8,10 +8,11 @@ pid_t fork(void)
 	pid_t ret;
 	if (libc.fork_handler) libc.fork_handler(-1);
 	ret = syscall(SYS_fork);
-	if (libc.threaded && !ret) {
+	if (libc.main_thread && !ret) {
 		pthread_t self = __pthread_self();
 		self->tid = self->pid = syscall(SYS_getpid);
 		libc.threads_minus_1 = 0;
+		libc.main_thread = self;
 	}
 	if (libc.fork_handler) libc.fork_handler(!ret);
 	return ret;