tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

liblog: don't destroy global mutexes

Browse source 
Some objects may log when they're destructed, so don't destroy the
global std::mutex in fake_log_device.cpp.

Test: AAPT works with a log in VectorImpl::finish_vector()
Change-Id: Ie5a0ac9fc4e6a137e9516059a831e499d55d5ddb
This commit is contained in:
Tom Cherry 2019-12-20 16:06:34 -08:00
parent 264a37d12f
commit ee747e7dfa
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
liblog/Android.bp
View file

@ -95,7 +95,10 @@ cc_library {
},
},
header_libs: ["liblog_headers"],
header_libs: [
"libbase_headers",
"liblog_headers",
],
export_header_lib_headers: ["liblog_headers"],
stubs: {

7
liblog/fake_log_device.cpp
View file

@ -31,6 +31,7 @@
#include <mutex>
#include <android-base/no_destructor.h>
#include <android/log.h>
#include <log/log_id.h>
#include <log/logprint.h>
@ -72,7 +73,7 @@ typedef struct LogState {
} LogState;
static LogState log_state;
static std::mutex fake_log_mutex;
static android::base::NoDestructor<std::mutex> fake_log_mutex;
/*
* Configure logging based on ANDROID_LOG_TAGS environment variable. We
@ -457,7 +458,7 @@ static int FakeWrite(log_id_t log_id, struct timespec*, struct iovec* vector, si
* Also guarantees that only one thread is in showLog() at a given
* time (if it matters).
*/
auto lock = std::lock_guard{fake_log_mutex};
auto lock = std::lock_guard{*fake_log_mutex};
if (!log_state.initialized) {
InitializeLogStateLocked();
@ -519,7 +520,7 @@ static int FakeWrite(log_id_t log_id, struct timespec*, struct iovec* vector, si
* help debug HOST tools ...
*/
static void FakeClose() {
auto lock = std::lock_guard{fake_log_mutex};
auto lock = std::lock_guard{*fake_log_mutex};
memset(&log_state, 0, sizeof(log_state));
}