about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-04-01 22:07:59 -0400
committerRich Felker <dalias@aerifal.cx>2011-04-01 22:07:59 -0400
commit6c16d3e98ab2e466bb12ded12dfad1f8f272b1f8 (patch)
treea90fe8880f6a601f81885b839369d2e030da9a70
parent5243e5f1606a9c6fcf01414ed5561616588bc0b9 (diff)
downloadmusl-6c16d3e98ab2e466bb12ded12dfad1f8f272b1f8.tar.gz
musl-6c16d3e98ab2e466bb12ded12dfad1f8f272b1f8.tar.xz
musl-6c16d3e98ab2e466bb12ded12dfad1f8f272b1f8.zip
use bss instead of mmap for main thread's pthread thread-specific data
this simplifies code and removes a failure case
-rw-r--r--src/thread/pthread_key_create.c1
-rw-r--r--src/thread/pthread_self.c12
2 files changed, 4 insertions, 9 deletions
diff --git a/src/thread/pthread_key_create.c b/src/thread/pthread_key_create.c
index c703bfe3..8d7f8162 100644
--- a/src/thread/pthread_key_create.c
+++ b/src/thread/pthread_key_create.c
@@ -1,6 +1,7 @@
 #include "pthread_impl.h"
 
 const size_t __pthread_tsd_size = sizeof(void *) * PTHREAD_KEYS_MAX;
+void *__pthread_tsd_main[PTHREAD_KEYS_MAX] = { 0 };
 
 static void nodtor(void *dummy)
 {
diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index c3d1be78..83efa9e8 100644
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -3,8 +3,8 @@
 static struct pthread main_thread;
 
 /* pthread_key_create.c overrides this */
-static const size_t dummy = 0;
-weak_alias(dummy, __pthread_tsd_size);
+static const void *dummy[1] = { 0 };
+weak_alias(dummy, __pthread_tsd_main);
 
 #undef errno
 static int *errno_location()
@@ -14,13 +14,7 @@ static int *errno_location()
 
 static int init_main_thread()
 {
-	void *tsd = 0;
-	if (__pthread_tsd_size) {
-		tsd = mmap(0, __pthread_tsd_size, PROT_READ|PROT_WRITE,
-			MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
-		if (tsd == MAP_FAILED) return -1;
-	}
-	main_thread.tsd = tsd;
+	main_thread.tsd = (void **)__pthread_tsd_main;
 	main_thread.self = &main_thread;
 	if (__set_thread_area(&main_thread) < 0)
 		return -1;