generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Call __cxa_thread_finalize for the main thread."

Browse Source
This commit is contained in:
Dmitriy Ivanov 2015-04-16 08:06:02 +00:00 committed by Gerrit Code Review
commit a40cb0ca7f
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/Android.mk
View File

@ -63,6 +63,7 @@ libc_common_src_files := \
stdio/sprintf.c \ stdio/sprintf.c \
stdio/stdio.c \ stdio/stdio.c \
stdio/stdio_ext.cpp \ stdio/stdio_ext.cpp \
stdlib/exit.c \
# Fortify implementations of libc functions. # Fortify implementations of libc functions.
libc_common_src_files += \ libc_common_src_files += \
@ -480,7 +481,6 @@ libc_upstream_openbsd_ndk_src_files := \
upstream-openbsd/lib/libc/stdlib/atoi.c \ upstream-openbsd/lib/libc/stdlib/atoi.c \
upstream-openbsd/lib/libc/stdlib/atol.c \ upstream-openbsd/lib/libc/stdlib/atol.c \
upstream-openbsd/lib/libc/stdlib/atoll.c \ upstream-openbsd/lib/libc/stdlib/atoll.c \
upstream-openbsd/lib/libc/stdlib/exit.c \
upstream-openbsd/lib/libc/stdlib/getenv.c \ upstream-openbsd/lib/libc/stdlib/getenv.c \
upstream-openbsd/lib/libc/stdlib/insque.c \ upstream-openbsd/lib/libc/stdlib/insque.c \
upstream-openbsd/lib/libc/stdlib/lsearch.c \ upstream-openbsd/lib/libc/stdlib/lsearch.c \

11
libc/upstream-openbsd/lib/libc/stdlib/exit.c → libc/stdlib/exit.c
View File

@ -32,8 +32,6 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include "atexit.h"
#include "thread_private.h"
/* /*
* This variable is zero until a process has created a thread. * This variable is zero until a process has created a thread.
@ -44,12 +42,21 @@
*/ */
int __isthreaded = 0; int __isthreaded = 0;
/* BEGIN android-added: using __cxa_finalize and __cxa_thread_finalize */
extern void __cxa_finalize(void* dso_handle);
extern void __cxa_thread_finalize();
/* END android-added */
/* /*
* Exit, flushing stdio buffers if necessary. * Exit, flushing stdio buffers if necessary.
*/ */
void void
exit(int status) exit(int status)
{ {
/* BEGIN android-added: call thread_local d-tors */
__cxa_thread_finalize();
/* END android-added */
/* /*
* Call functions registered by atexit() or _cxa_atexit() * Call functions registered by atexit() or _cxa_atexit()
* (including the stdio cleanup routine) and then _exit(). * (including the stdio cleanup routine) and then _exit().

23
tests/__cxa_thread_atexit_test.cpp
View File

@ -50,6 +50,29 @@ TEST(thread_local, smoke) {
ASSERT_EQ("dtor called.", class_with_dtor_output); ASSERT_EQ("dtor called.", class_with_dtor_output);
} }
class ClassWithDtorForMainThread {
public:
void set_message(const std::string& msg) {
message = msg;
}
~ClassWithDtorForMainThread() {
fprintf(stderr, "%s", message.c_str());
}
private:
std::string message;
};
static void thread_atexit_main() {
static thread_local ClassWithDtorForMainThread class_with_dtor_for_main_thread;
class_with_dtor_for_main_thread.set_message("d-tor for main thread called.");
exit(0);
}
TEST(thread_local, dtor_for_main_thread) {
ASSERT_EXIT(thread_atexit_main(), testing::ExitedWithCode(0), "d-tor for main thread called.");
}
extern "C" int __cxa_thread_atexit_impl(void (*fn)(void*), void* arg, void* dso_handle); extern "C" int __cxa_thread_atexit_impl(void (*fn)(void*), void* arg, void* dso_handle);
static void thread_atexit_fn1(void* arg) { static void thread_atexit_fn1(void* arg) {