5bb113cba2
On http://b/122082295 we had this abort: 12-27 15:29:31.237 10222 10814 10848 F libc : invalid pthread_t 0xb1907960 passed to libc This wasn't super helpful. We can do better. Now you get something like this instead: 03-27 02:34:58.754 25329 25329 W libc : invalid pthread_t (0) passed to pthread_join Test: adb shell crasher Bug: http://b/123255692 Change-Id: I1d545665a233308480cc3747ec3120e2b6de0453
74 lines
2.6 KiB
C++
74 lines
2.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 <errno.h>
|
|
|
|
#include "private/bionic_defs.h"
|
|
#include "private/bionic_futex.h"
|
|
#include "private/bionic_systrace.h"
|
|
#include "pthread_internal.h"
|
|
|
|
__BIONIC_WEAK_FOR_NATIVE_BRIDGE
|
|
int pthread_join(pthread_t t, void** return_value) {
|
|
ScopedTrace trace("pthread_join");
|
|
if (t == pthread_self()) {
|
|
return EDEADLK;
|
|
}
|
|
|
|
pthread_internal_t* thread = __pthread_internal_find(t, "pthread_join");
|
|
if (thread == nullptr) {
|
|
return ESRCH;
|
|
}
|
|
|
|
ThreadJoinState old_state = THREAD_NOT_JOINED;
|
|
while ((old_state == THREAD_NOT_JOINED || old_state == THREAD_EXITED_NOT_JOINED) &&
|
|
!atomic_compare_exchange_weak(&thread->join_state, &old_state, THREAD_JOINED)) {
|
|
}
|
|
|
|
if (old_state == THREAD_DETACHED || old_state == THREAD_JOINED) {
|
|
return EINVAL;
|
|
}
|
|
|
|
pid_t tid = thread->tid;
|
|
volatile int* tid_ptr = &thread->tid;
|
|
|
|
// We set thread->join_state to THREAD_JOINED with atomic operation,
|
|
// so no one is going to remove this thread except us.
|
|
|
|
// Wait for the thread to actually exit, if it hasn't already.
|
|
while (*tid_ptr != 0) {
|
|
__futex_wait(tid_ptr, tid, nullptr);
|
|
}
|
|
|
|
if (return_value) {
|
|
*return_value = thread->return_value;
|
|
}
|
|
|
|
__pthread_internal_remove_and_free(thread);
|
|
return 0;
|
|
}
|