diff options
author | Dan Albert <danalbert@google.com> | 2015-04-03 17:31:04 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-03 17:31:04 +0000 |
commit | 4270d8e5a9005a6e6e51581744ee4953b808edf1 (patch) | |
tree | 4dce4e9053d554739091338e9074af58dc430fe0 | |
parent | cb2286d9c30567f72f634cda356f05206c11dd26 (diff) | |
parent | 87044e667e0a0f7fbbb893742c441209072096a0 (diff) | |
download | system_core-4270d8e5a9005a6e6e51581744ee4953b808edf1.zip system_core-4270d8e5a9005a6e6e51581744ee4953b808edf1.tar.gz system_core-4270d8e5a9005a6e6e51581744ee4953b808edf1.tar.bz2 |
am 87044e66: am 5a50b16e: am 8ea5dd8c: Merge "Remove LogMessage::LogLineLowStack."
* commit '87044e667e0a0f7fbbb893742c441209072096a0':
Remove LogMessage::LogLineLowStack.
-rw-r--r-- | base/include/base/logging.h | 4 | ||||
-rw-r--r-- | base/logging.cpp | 44 |
2 files changed, 0 insertions, 48 deletions
diff --git a/base/include/base/logging.h b/base/include/base/logging.h index 5e115fe..0283217 100644 --- a/base/include/base/logging.h +++ b/base/include/base/logging.h @@ -241,10 +241,6 @@ class LogMessage { static void LogLine(const char* file, unsigned int line, LogSeverity severity, const char* msg); - // A variant of the above for use with little stack. - static void LogLineLowStack(const char* file, unsigned int line, - LogSeverity severity, const char* msg); - private: const std::unique_ptr<LogMessageData> data_; diff --git a/base/logging.cpp b/base/logging.cpp index 38ee2af..144388a 100644 --- a/base/logging.cpp +++ b/base/logging.cpp @@ -245,50 +245,6 @@ void LogMessage::LogLine(const char* file, unsigned int line, #endif } -void LogMessage::LogLineLowStack(const char* file, unsigned int line, - LogSeverity log_severity, const char* message) { -#ifdef __ANDROID__ - // Use android_writeLog() to avoid stack-based buffers used by - // android_printLog(). - const char* tag = ProgramInvocationShortName(); - int priority = kLogSeverityToAndroidLogPriority[log_severity]; - char* buf = nullptr; - size_t buf_size = 0u; - if (priority == ANDROID_LOG_FATAL) { - // Allocate buffer for snprintf(buf, buf_size, "%s:%u] %s", file, line, - // message) below. If allocation fails, fall back to printing only the - // message. - buf_size = strlen(file) + 1 /* ':' */ + - std::numeric_limits<typeof(line)>::max_digits10 + 2 /* "] " */ + - strlen(message) + 1 /* terminating 0 */; - buf = reinterpret_cast<char*>(malloc(buf_size)); - } - if (buf != nullptr) { - snprintf(buf, buf_size, "%s:%u] %s", file, line, message); - android_writeLog(priority, tag, buf); - free(buf); - } else { - android_writeLog(priority, tag, message); - } -#else - static const char* log_characters = "VDIWEF"; - CHECK_EQ(strlen(log_characters), FATAL + 1U); - - const char* program_name = ProgramInvocationShortName(); - write(STDERR_FILENO, program_name, strlen(program_name)); - write(STDERR_FILENO, " ", 1); - write(STDERR_FILENO, &log_characters[log_severity], 1); - write(STDERR_FILENO, " ", 1); - // TODO: pid and tid. - write(STDERR_FILENO, file, strlen(file)); - // TODO: line. - UNUSED(line); - write(STDERR_FILENO, "] ", 2); - write(STDERR_FILENO, message, strlen(message)); - write(STDERR_FILENO, "\n", 1); -#endif -} - ScopedLogSeverity::ScopedLogSeverity(LogSeverity level) { old_ = gMinimumLogSeverity; gMinimumLogSeverity = level; |