index d4d60994600e1f0b06daf79ea45029238cbb3943..33cddd74e771683f587a9398275b234e60ee0449 100644 (file)
#include "pthread_internal.h"
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/mman.h>
+
#include "private/bionic_futex.h"
-#include "private/bionic_pthread.h"
#include "private/bionic_tls.h"
+#include "private/libc_logging.h"
#include "private/ScopedPthreadMutexLocker.h"
-pthread_internal_t* gThreadList = NULL;
-pthread_mutex_t gThreadListLock = PTHREAD_MUTEX_INITIALIZER;
+pthread_internal_t* g_thread_list = NULL;
+pthread_mutex_t g_thread_list_lock = PTHREAD_MUTEX_INITIALIZER;
+
+pthread_internal_t* __create_thread_struct() {
+ void* result = mmap(NULL, sizeof(pthread_internal_t), PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0);
+ if (result == MAP_FAILED) {
+ __libc_format_log(ANDROID_LOG_WARN, "libc",
+ "__create_thread_struct() failed: %s", strerror(errno));
+ return NULL;
+ }
+ return reinterpret_cast<pthread_internal_t*>(result);
+}
+
+void __free_thread_struct(pthread_internal_t* thread) {
+ int result = munmap(thread, sizeof(pthread_internal_t));
+ if (result != 0) {
+ __libc_format_log(ANDROID_LOG_WARN, "libc",
+ "__free_thread_struct() failed: %s", strerror(errno));
+ }
+}
void _pthread_internal_remove_locked(pthread_internal_t* thread) {
if (thread->next != NULL) {
if (thread->prev != NULL) {
thread->prev->next = thread->next;
} else {
- gThreadList = thread->next;
+ g_thread_list = thread->next;
}
// The main thread is not heap-allocated. See __libc_init_tls for the declaration,
// and __libc_init_common for the point where it's added to the thread list.
if ((thread->attr.flags & PTHREAD_ATTR_FLAG_MAIN_THREAD) == 0) {
- free(thread);
+ __free_thread_struct(thread);
}
}
void _pthread_internal_add(pthread_internal_t* thread) {
- ScopedPthreadMutexLocker locker(&gThreadListLock);
+ ScopedPthreadMutexLocker locker(&g_thread_list_lock);
// We insert at the head.
- thread->next = gThreadList;
+ thread->next = g_thread_list;
thread->prev = NULL;
if (thread->next != NULL) {
thread->next->prev = thread;
}
- gThreadList = thread;
+ g_thread_list = thread;
}
pthread_internal_t* __get_thread(void) {
return reinterpret_cast<pthread_internal_t*>(__get_tls()[TLS_SLOT_THREAD_ID]);
}
-
-pid_t __pthread_gettid(pthread_t t) {
- return reinterpret_cast<pthread_internal_t*>(t)->tid;
-}
-
-// Initialize 'ts' with the difference between 'abstime' and the current time
-// according to 'clock'. Returns -1 if abstime already expired, or 0 otherwise.
-int __timespec_from_absolute(timespec* ts, const timespec* abstime, clockid_t clock) {
- clock_gettime(clock, ts);
- ts->tv_sec = abstime->tv_sec - ts->tv_sec;
- ts->tv_nsec = abstime->tv_nsec - ts->tv_nsec;
- if (ts->tv_nsec < 0) {
- ts->tv_sec--;
- ts->tv_nsec += 1000000000;
- }
- if ((ts->tv_nsec < 0) || (ts->tv_sec < 0)) {
- return -1;
- }
- return 0;
-}
-
-int __futex_wake_ex(volatile void* ftx, int pshared, int val) {
- return __futex_syscall3(ftx, pshared ? FUTEX_WAKE : FUTEX_WAKE_PRIVATE, val);
-}
-
-int __futex_wait_ex(volatile void* ftx, int pshared, int val, const timespec* timeout) {
- return __futex_syscall4(ftx, pshared ? FUTEX_WAIT : FUTEX_WAIT_PRIVATE, val, timeout);
-}