Merge changes Ie15fcb8f,I0a895911
* changes:
base: add quick_exit emulation.
base: extract mutex.h from logging.cpp.
diff --git a/base/Android.bp b/base/Android.bp
index 7bf4c79..e260412 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -28,6 +28,7 @@
"file.cpp",
"logging.cpp",
"parsenetaddress.cpp",
+ "quick_exit.cpp",
"stringprintf.cpp",
"strings.cpp",
"test_utils.cpp",
@@ -71,6 +72,7 @@
"logging_test.cpp",
"parseint_test.cpp",
"parsenetaddress_test.cpp",
+ "quick_exit_test.cpp",
"stringprintf_test.cpp",
"strings_test.cpp",
"test_main.cpp",
diff --git a/base/include/android-base/mutex.h b/base/include/android-base/mutex.h
new file mode 100644
index 0000000..22e75c7
--- /dev/null
+++ b/base/include/android-base/mutex.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <mutex>
+
+#include "android-base/macros.h"
+
+#if defined(_WIN32)
+#include <windows.h>
+
+namespace std {
+class mutex {
+ public:
+ mutex() {
+ InitializeCriticalSection(&critical_section_);
+ }
+ ~mutex() {
+ DeleteCriticalSection(&critical_section_);
+ }
+
+ void lock() {
+ EnterCriticalSection(&critical_section_);
+ }
+
+ void unlock() {
+ LeaveCriticalSection(&critical_section_);
+ }
+
+ private:
+ CRITICAL_SECTION critical_section_;
+ DISALLOW_COPY_AND_ASSIGN(mutex);
+};
+} // namespace std
+#endif
diff --git a/base/include/android-base/quick_exit.h b/base/include/android-base/quick_exit.h
new file mode 100644
index 0000000..a03b14f
--- /dev/null
+++ b/base/include/android-base/quick_exit.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <stdlib.h>
+
+// Provide emulation for at_quick_exit/quick_exit on platforms that don't have it.
+namespace android {
+namespace base {
+
+// Bionic and glibc have quick_exit, Darwin and Windows don't.
+#if !defined(__linux__)
+ void quick_exit(int exit_code) __attribute__((noreturn));
+ int at_quick_exit(void (*func)());
+#else
+ using ::at_quick_exit;
+ using ::quick_exit;
+#endif
+}
+}
diff --git a/base/logging.cpp b/base/logging.cpp
index 6e1dd9c..33313e4 100644
--- a/base/logging.cpp
+++ b/base/logging.cpp
@@ -37,16 +37,14 @@
#include <iostream>
#include <limits>
+#include <mutex>
#include <sstream>
#include <string>
#include <utility>
#include <vector>
-#ifndef _WIN32
-#include <mutex>
-#endif
-
#include "android-base/macros.h"
+#include "android-base/mutex.h"
#include "android-base/strings.h"
// Headers for LogMessage::LogLine.
@@ -92,17 +90,11 @@
}
namespace {
-#ifndef _WIN32
-using std::mutex;
-using std::lock_guard;
-
#if defined(__GLIBC__)
const char* getprogname() {
return program_invocation_short_name;
}
-#endif
-
-#else
+#elif defined(_WIN32)
const char* getprogname() {
static bool first = true;
static char progname[MAX_PATH] = {};
@@ -121,51 +113,13 @@
return progname;
}
-
-class mutex {
- public:
- mutex() {
- InitializeCriticalSection(&critical_section_);
- }
- ~mutex() {
- DeleteCriticalSection(&critical_section_);
- }
-
- void lock() {
- EnterCriticalSection(&critical_section_);
- }
-
- void unlock() {
- LeaveCriticalSection(&critical_section_);
- }
-
- private:
- CRITICAL_SECTION critical_section_;
-};
-
-template <typename LockT>
-class lock_guard {
- public:
- explicit lock_guard(LockT& lock) : lock_(lock) {
- lock_.lock();
- }
-
- ~lock_guard() {
- lock_.unlock();
- }
-
- private:
- LockT& lock_;
-
- DISALLOW_COPY_AND_ASSIGN(lock_guard);
-};
#endif
} // namespace
namespace android {
namespace base {
-static auto& logging_lock = *new mutex();
+static auto& logging_lock = *new std::mutex();
#ifdef __ANDROID__
static auto& gLogger = *new LogFunction(LogdLogger());
@@ -354,12 +308,12 @@
}
void SetLogger(LogFunction&& logger) {
- lock_guard<mutex> lock(logging_lock);
+ std::lock_guard<std::mutex> lock(logging_lock);
gLogger = std::move(logger);
}
void SetAborter(AbortFunction&& aborter) {
- lock_guard<mutex> lock(logging_lock);
+ std::lock_guard<std::mutex> lock(logging_lock);
gAborter = std::move(aborter);
}
@@ -445,7 +399,7 @@
{
// Do the actual logging with the lock held.
- lock_guard<mutex> lock(logging_lock);
+ std::lock_guard<std::mutex> lock(logging_lock);
if (msg.find('\n') == std::string::npos) {
LogLine(data_->GetFile(), data_->GetLineNumber(), data_->GetId(),
data_->GetSeverity(), msg.c_str());
diff --git a/base/quick_exit.cpp b/base/quick_exit.cpp
new file mode 100644
index 0000000..d9fba03
--- /dev/null
+++ b/base/quick_exit.cpp
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "android-base/quick_exit.h"
+
+#if !defined(__linux__)
+
+#include <mutex>
+#include <vector>
+
+#include "android-base/mutex.h"
+
+namespace android {
+namespace base {
+
+static std::mutex quick_exit_mutex;
+static std::vector<void(*)()> quick_exit_handlers;
+
+void quick_exit(int exit_code) {
+ std::lock_guard<std::mutex> lock(quick_exit_mutex);
+ for (auto it = quick_exit_handlers.rbegin(); it != quick_exit_handlers.rend(); ++it) {
+ (*it)();
+ }
+ _Exit(exit_code);
+}
+
+int at_quick_exit(void (*func)()) {
+ std::lock_guard<std::mutex> lock(quick_exit_mutex);
+ quick_exit_handlers.push_back(func);
+ return 0;
+}
+
+} // namespace base
+} // namespace android
+#endif
diff --git a/base/quick_exit_test.cpp b/base/quick_exit_test.cpp
new file mode 100644
index 0000000..7ca8156
--- /dev/null
+++ b/base/quick_exit_test.cpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "android-base/quick_exit.h"
+
+#include <gtest/gtest.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <string>
+
+#include "android-base/test_utils.h"
+
+// These tests are a bit sketchy, since each test run adds global state that affects subsequent
+// tests (including ones not in this file!). Exit with 0 in Exiter and stick the at_quick_exit test
+// at the end to hack around this.
+struct Exiter {
+ ~Exiter() {
+ _Exit(0);
+ }
+};
+
+TEST(quick_exit, smoke) {
+ ASSERT_EXIT(android::base::quick_exit(123), testing::ExitedWithCode(123), "");
+}
+
+TEST(quick_exit, skip_static_destructors) {
+ static Exiter exiter;
+ ASSERT_EXIT(android::base::quick_exit(123), testing::ExitedWithCode(123), "");
+}
+
+TEST(quick_exit, at_quick_exit) {
+ static int counter = 4;
+ // "Functions passed to at_quick_exit are called in reverse order of their registration."
+ ASSERT_EQ(0, android::base::at_quick_exit([]() { _exit(counter); }));
+ ASSERT_EQ(0, android::base::at_quick_exit([]() { counter += 2; }));
+ ASSERT_EQ(0, android::base::at_quick_exit([]() { counter *= 10; }));
+ ASSERT_EXIT(android::base::quick_exit(123), testing::ExitedWithCode(42), "");
+}