ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge \\"Add timestamps to libbase\\'s stderr logging.\\" am: 55d20a7632

Browse source 
am: dc1c4261f4

Change-Id: I18a9c1b10450cfee9531091be4c18a2484c9a2cd
This commit is contained in:
Elliott Hughes 2016-06-22 15:34:39 +00:00 • committed by android-build-merger
commit 43c2aea0ca
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
base/logging.cpp
View file

@ -21,6 +21,7 @@
#include "android-base/logging.h" #include "android-base/logging.h"
#include <libgen.h> #include <libgen.h>
#include <time.h>
// For getprogname(3) or program_invocation_short_name. // For getprogname(3) or program_invocation_short_name.
#if defined(__ANDROID__) || defined(__APPLE__) #if defined(__ANDROID__) || defined(__APPLE__)
@ -186,12 +187,24 @@ static const char* ProgramInvocationName() {
void StderrLogger(LogId, LogSeverity severity, const char*, const char* file, void StderrLogger(LogId, LogSeverity severity, const char*, const char* file,
unsigned int line, const char* message) { unsigned int line, const char* message) {
struct tm now;
time_t t = time(nullptr);
#if defined(_WIN32)
localtime_s(&now, &t);
#else
localtime_r(&t, &now);
#endif
char timestamp[32];
strftime(timestamp, sizeof(timestamp), "%m-%d %H:%M:%S", &now);
static const char log_characters[] = "VDIWEF"; static const char log_characters[] = "VDIWEF";
static_assert(arraysize(log_characters) - 1 == FATAL + 1, static_assert(arraysize(log_characters) - 1 == FATAL + 1,
"Mismatch in size of log_characters and values in LogSeverity"); "Mismatch in size of log_characters and values in LogSeverity");
char severity_char = log_characters[severity]; char severity_char = log_characters[severity];
fprintf(stderr, "%s %c %5d %5d %s:%u] %s\n", ProgramInvocationName(), fprintf(stderr, "%s %c %s %5d %5d %s:%u] %s\n", ProgramInvocationName(),
severity_char, getpid(), GetThreadId(), file, line, message); severity_char, timestamp, getpid(), GetThreadId(), file, line, message);
} }