pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "Eliminate deadlock in forked child due to delayed resetting mutex lock"

This commit is contained in:
Dimitry Ivanov 2016-11-08 20:59:42 +00:00 committed by Gerrit Code Review
parent bfc6ce6424 f6a21bfac5
commit 8bfaac0f8a
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libc/bionic/pthread_atfork.cpp
View File

@ -130,13 +130,15 @@ void __bionic_atfork_run_prepare() {
}
void __bionic_atfork_run_child() {
g_atfork_list_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
pthread_mutex_lock(&g_atfork_list_mutex);
g_atfork_list.walk_forward([](atfork_t* it) {
if (it->child != nullptr) {
it->child();
}
});
g_atfork_list_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
pthread_mutex_unlock(&g_atfork_list_mutex);
}
void __bionic_atfork_run_parent() {

30
tests/pthread_dlfcn_test.cpp
View File

@ -37,6 +37,11 @@ static void AtForkChild2() { g_atfork_child_calls = (g_atfork_child_calls * 10)
static void AtForkChild3() { g_atfork_child_calls = (g_atfork_child_calls * 10) + 3; }
static void AtForkChild4() { g_atfork_child_calls = (g_atfork_child_calls * 10) + 4; }
static void* g_atfork_test_handle = nullptr;
static void AtForkPrepare() {}
static void AtForkParent() {}
static void AtForkChild() { dlclose(g_atfork_test_handle); g_atfork_test_handle = dlopen("libtest_pthread_atfork.so", RTLD_NOW | RTLD_LOCAL); }
TEST(pthread, pthread_atfork_with_dlclose) {
ASSERT_EQ(0, pthread_atfork(AtForkPrepare1, AtForkParent1, AtForkChild1));
@ -82,3 +87,28 @@ TEST(pthread, pthread_atfork_with_dlclose) {
AssertChildExited(pid, 0);
}
TEST(pthread, pthread_atfork_child_with_dlclose) {
g_atfork_test_handle = dlopen("libtest_pthread_atfork.so", RTLD_NOW | RTLD_LOCAL);
ASSERT_TRUE(g_atfork_test_handle != nullptr) << dlerror();
typedef int (*fn_t)(void (*)(void), void (*)(void), void (*)(void));
fn_t fn = reinterpret_cast<fn_t>(dlsym(g_atfork_test_handle, "proxy_pthread_atfork"));
ASSERT_TRUE(fn != nullptr) << dlerror();
// the library registers 2 additional atfork handlers in a constructor
ASSERT_EQ(0, pthread_atfork(AtForkPrepare, AtForkParent, AtForkChild));
pid_t pid = fork();
ASSERT_NE(-1, pid) << strerror(errno);
if (pid == 0) {
_exit(0);
}
AssertChildExited(pid, 0);
EXPECT_EQ(0, dlclose(g_atfork_test_handle));
g_atfork_test_handle = nullptr;
}