c3f114037d
<pthread.h> was missing nonnull attributes, noreturn on pthread_exit, and had incorrect cv qualifiers for several standard functions. I've also marked the non-standard stuff (where I count glibc rather than POSIX as "standard") so we can revisit this cruft for LP64 and try to ensure we're compatible with glibc. I've also broken out the pthread_cond* functions into a new file. I've made the remaining pthread files (plus ptrace) part of the bionic code and fixed all the warnings. I've added a few more smoke tests for chunks of untested pthread functionality. We no longer need the libc_static_common_src_files hack for any of the pthread implementation because we long since stripped out the rest of the armv5 support, and this hack was just to ensure that __get_tls in libc.a went via the kernel if necessary. This patch also finishes the job of breaking up the pthread.c monolith, and adds a handful of new tests. Change-Id: Idc0ae7f5d8aa65989598acd4c01a874fe21582c7
106 lines
3.6 KiB
C++
106 lines
3.6 KiB
C++
/*
|
|
* Copyright (C) 2008 The Android Open Source Project
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
|
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "pthread_internal.h"
|
|
|
|
#include "private/bionic_futex.h"
|
|
#include "private/bionic_pthread.h"
|
|
#include "private/bionic_tls.h"
|
|
#include "private/ScopedPthreadMutexLocker.h"
|
|
|
|
pthread_internal_t* gThreadList = NULL;
|
|
pthread_mutex_t gThreadListLock = PTHREAD_MUTEX_INITIALIZER;
|
|
|
|
void _pthread_internal_remove_locked(pthread_internal_t* thread) {
|
|
if (thread->next != NULL) {
|
|
thread->next->prev = thread->prev;
|
|
}
|
|
if (thread->prev != NULL) {
|
|
thread->prev->next = thread->next;
|
|
} else {
|
|
gThreadList = 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->allocated_on_heap) {
|
|
free(thread);
|
|
}
|
|
}
|
|
|
|
void _pthread_internal_add(pthread_internal_t* thread) {
|
|
ScopedPthreadMutexLocker locker(&gThreadListLock);
|
|
|
|
// We insert at the head.
|
|
thread->next = gThreadList;
|
|
thread->prev = NULL;
|
|
if (thread->next != NULL) {
|
|
thread->next->prev = thread;
|
|
}
|
|
gThreadList = 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;
|
|
}
|
|
|
|
int __pthread_settid(pthread_t t, pid_t tid) {
|
|
if (t == 0) {
|
|
return EINVAL;
|
|
}
|
|
reinterpret_cast<pthread_internal_t*>(t)->tid = tid;
|
|
return 0;
|
|
}
|
|
|
|
// 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_to_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);
|
|
}
|