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

am 2b6cdb5e: Merge "Add atexit test for attributed c-tor/d-tor"

Browse Source 
* commit '2b6cdb5e459661727c99e81660c7c3df5cdbe024':
  Add atexit test for attributed c-tor/d-tor
This commit is contained in:
Dmitriy Ivanov
2014-08-15 23:13:30 +00:00
committed by Android Git Automerger
parent 18fbdce86e 2b6cdb5e45
commit 05d2a98133
3 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/atexit_test.cpp
View File

@@ -24,20 +24,33 @@
#include <string> #include <string>
TEST(atexit, dlclose) { TEST(atexit, sofile) {
std::string atexit_call_sequence; std::string atexit_call_sequence;
bool valid_this_in_static_dtor = false; bool valid_this_in_static_dtor = false;
bool attr_dtor_called = false;
void* handle = dlopen("libtest_atexit.so", RTLD_NOW); void* handle = dlopen("libtest_atexit.so", RTLD_NOW);
ASSERT_TRUE(handle != NULL); ASSERT_TRUE(handle != nullptr);
typedef int (*int_fn)(void);
int_fn get_cxx_ctor_called, get_attr_ctor_called;
get_cxx_ctor_called = reinterpret_cast<int_fn>(dlsym(handle, "get_cxx_ctor_called"));
get_attr_ctor_called = reinterpret_cast<int_fn>(dlsym(handle, "get_attr_ctor_called"));
ASSERT_TRUE(get_cxx_ctor_called != nullptr);
ASSERT_TRUE(get_attr_ctor_called != nullptr);
ASSERT_EQ(1, get_cxx_ctor_called());
ASSERT_EQ(1, get_attr_ctor_called());
void* sym = dlsym(handle, "register_atexit"); void* sym = dlsym(handle, "register_atexit");
ASSERT_TRUE(sym != NULL); ASSERT_TRUE(sym != nullptr);
reinterpret_cast<void (*)(std::string*, bool*)>(sym)(&atexit_call_sequence, &valid_this_in_static_dtor); reinterpret_cast<void (*)(std::string*, bool*, bool*)>(sym)(&atexit_call_sequence, &valid_this_in_static_dtor, &attr_dtor_called);
ASSERT_EQ(0, dlclose(handle)); ASSERT_EQ(0, dlclose(handle));
// this test verifies atexit call from atexit handler. as well as the order of calls // this test verifies atexit call from atexit handler. as well as the order of calls
ASSERT_EQ("Humpty Dumpty sat on a wall", atexit_call_sequence); ASSERT_EQ("Humpty Dumpty sat on a wall", atexit_call_sequence);
ASSERT_TRUE(valid_this_in_static_dtor); ASSERT_TRUE(valid_this_in_static_dtor);
ASSERT_TRUE(attr_dtor_called);
} }
class TestMainStaticDtorClass { class TestMainStaticDtorClass {
@@ -57,7 +70,7 @@ class TestMainStaticDtorClass {
static const TestMainStaticDtorClass* expected_this; static const TestMainStaticDtorClass* expected_this;
}; };
const TestMainStaticDtorClass* TestMainStaticDtorClass::expected_this = NULL; const TestMainStaticDtorClass* TestMainStaticDtorClass::expected_this = nullptr;
static void atexit_func5() { static void atexit_func5() {
fprintf(stderr, "5"); fprintf(stderr, "5");

1
tests/libs/Android.mk
View File

@@ -17,6 +17,7 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
TEST_PATH := $(LOCAL_PATH)/.. TEST_PATH := $(LOCAL_PATH)/..
common_cppflags += -std=gnu++11
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Library used by dlfcn tests. # Library used by dlfcn tests.
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

37
tests/libs/atexit_testlib.cpp
View File

@@ -19,12 +19,19 @@
#include <string> #include <string>
// use external control number from main test // use external control number from main test
static std::string* atexit_sequence = NULL; static std::string* atexit_sequence = nullptr;
static bool* atexit_valid_this_in_static_dtor = NULL; static bool* atexit_valid_this_in_static_dtor = nullptr;
static bool* atexit_attr_dtor_called = nullptr;
static int cxx_ctor_called = 0;
static int attr_ctor_called = 0;
static class AtExitStaticClass { static class AtExitStaticClass {
public: public:
AtExitStaticClass() { expected_this = this; } AtExitStaticClass() {
expected_this = this;
cxx_ctor_called = 1;
}
~AtExitStaticClass() { ~AtExitStaticClass() {
if (atexit_valid_this_in_static_dtor) { if (atexit_valid_this_in_static_dtor) {
*atexit_valid_this_in_static_dtor = (expected_this == this); *atexit_valid_this_in_static_dtor = (expected_this == this);
@@ -35,7 +42,7 @@ static class AtExitStaticClass {
} static_obj; } static_obj;
const AtExitStaticClass* AtExitStaticClass::expected_this = NULL; const AtExitStaticClass* AtExitStaticClass::expected_this = nullptr;
// 4 // 4
static void atexit_handler_from_atexit_from_atexit2() { static void atexit_handler_from_atexit_from_atexit2() {
@@ -66,10 +73,30 @@ static void atexit_handler_regular() {
*atexit_sequence += " a wall"; *atexit_sequence += " a wall";
} }
extern "C" void register_atexit(std::string* sequence, bool* valid_this_in_static_dtor) { // attribute c-tor and d-tor
static void __attribute__((constructor)) atexit_attr_ctor() {
attr_ctor_called = 1;
}
static void __attribute__((destructor)) atexit_attr_dtor() {
if (atexit_attr_dtor_called) {
*atexit_attr_dtor_called = true;
}
}
extern "C" void register_atexit(std::string* sequence, bool* valid_this_in_static_dtor, bool* attr_dtor_called) {
atexit_sequence = sequence; atexit_sequence = sequence;
atexit_valid_this_in_static_dtor = valid_this_in_static_dtor; atexit_valid_this_in_static_dtor = valid_this_in_static_dtor;
atexit_attr_dtor_called = attr_dtor_called;
atexit(atexit_handler_regular); atexit(atexit_handler_regular);
atexit(atexit_handler_with_atexit); atexit(atexit_handler_with_atexit);
} }
extern "C" int get_cxx_ctor_called() {
return cxx_ctor_called;
}
extern "C" int get_attr_ctor_called() {
return attr_ctor_called;
}