Skip to content

GitLab

T
tangled
Commit 93dd4257 authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot
Browse files
Options

Change logging::LOG_FOO to logging::LOGGING_FOO. 

Avoid conflicts with LOG_FOO in sys/syslog.h on Linux.

Convert LOG_FOO to LOGGING_FOO in base/, but leave the rest of the code
base untouched. Keep LOG_FOO defined for now to make it possible to
convert the rest of the code base in smaller increments.

BUG=849450

Change-Id: Icce5121f7cd036e9e9eddd7de68f57474f4ab73c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1086147Reviewed-by: default avatardanakj <danakj@chromium.org>
Reviewed-by: default avatarWez <wez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820349}
parent 707e8160
Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 123 deletions
base/check.cc
View file @ 93dd4257
......@@ -20,7 +20,7 @@ namespace logging {
CheckError CheckError::Check(const char* file,
int line,
const char* condition) {
CheckError check_error(new LogMessage(file, line, LOG_FATAL));
CheckError check_error(new LogMessage(file, line, LOGGING_FATAL));
check_error.stream() << "Check failed: " << condition << ". ";
return check_error;
}
......@@ -28,7 +28,7 @@ CheckError CheckError::Check(const char* file,
CheckError CheckError::CheckOp(const char* file,
int line,
CheckOpResult* check_op_result) {
CheckError check_error(new LogMessage(file, line, LOG_FATAL));
CheckError check_error(new LogMessage(file, line, LOGGING_FATAL));
check_error.stream() << "Check failed: " << check_op_result->message_;
free(check_op_result->message_);
check_op_result->message_ = nullptr;
......@@ -38,7 +38,7 @@ CheckError CheckError::CheckOp(const char* file,
CheckError CheckError::DCheck(const char* file,
int line,
const char* condition) {
CheckError check_error(new LogMessage(file, line, LOG_DCHECK));
CheckError check_error(new LogMessage(file, line, LOGGING_DCHECK));
check_error.stream() << "Check failed: " << condition << ". ";
return check_error;
}
......@@ -46,7 +46,7 @@ CheckError CheckError::DCheck(const char* file,
CheckError CheckError::DCheckOp(const char* file,
int line,
CheckOpResult* check_op_result) {
CheckError check_error(new LogMessage(file, line, LOG_DCHECK));
CheckError check_error(new LogMessage(file, line, LOGGING_DCHECK));
check_error.stream() << "Check failed: " << check_op_result->message_;
free(check_op_result->message_);
check_op_result->message_ = nullptr;
......@@ -59,9 +59,10 @@ CheckError CheckError::PCheck(const char* file,
SystemErrorCode err_code = logging::GetLastSystemErrorCode();
#if defined(OS_WIN)
CheckError check_error(
new Win32ErrorLogMessage(file, line, LOG_FATAL, err_code));
new Win32ErrorLogMessage(file, line, LOGGING_FATAL, err_code));
#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
CheckError check_error(new ErrnoLogMessage(file, line, LOG_FATAL, err_code));
CheckError check_error(
new ErrnoLogMessage(file, line, LOGGING_FATAL, err_code));
#endif
check_error.stream() << "Check failed: " << condition << ". ";
return check_error;
......@@ -77,9 +78,10 @@ CheckError CheckError::DPCheck(const char* file,
SystemErrorCode err_code = logging::GetLastSystemErrorCode();
#if defined(OS_WIN)
CheckError check_error(
new Win32ErrorLogMessage(file, line, LOG_DCHECK, err_code));
new Win32ErrorLogMessage(file, line, LOGGING_DCHECK, err_code));
#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
CheckError check_error(new ErrnoLogMessage(file, line, LOG_DCHECK, err_code));
CheckError check_error(
new ErrnoLogMessage(file, line, LOGGING_DCHECK, err_code));
#endif
check_error.stream() << "Check failed: " << condition << ". ";
return check_error;
......@@ -88,7 +90,7 @@ CheckError CheckError::DPCheck(const char* file,
CheckError CheckError::NotImplemented(const char* file,
int line,
const char* function) {
CheckError check_error(new LogMessage(file, line, LOG_ERROR));
CheckError check_error(new LogMessage(file, line, LOGGING_ERROR));
check_error.stream() << "Not implemented reached in " << function;
return check_error;
}
......@@ -107,7 +109,7 @@ CheckError::~CheckError() {
CheckError::CheckError(LogMessage* log_message) : log_message_(log_message) {}
void RawCheck(const char* message) {
RawLog(LOG_FATAL, message);
RawLog(LOGGING_FATAL, message);
}
} // namespace logging
base/check_unittest.cc
View file @ 93dd4257
......@@ -68,14 +68,14 @@ class ScopedCheckExpectation {
#endif
// Macro which expects a DCHECK to fire if DCHECKs are enabled.
#define EXPECT_DCHECK(msg, check_expr) \
do { \
if (DCHECK_IS_ON() && logging::LOG_DCHECK == logging::LOG_FATAL) { \
ScopedCheckExpectation check_exp(__FILE__, __LINE__, msg); \
check_expr; \
} else { \
check_expr; \
} \
#define EXPECT_DCHECK(msg, check_expr) \
do { \
if (DCHECK_IS_ON() && logging::LOGGING_DCHECK == logging::LOGGING_FATAL) { \
ScopedCheckExpectation check_exp(__FILE__, __LINE__, msg); \
check_expr; \
} else { \
check_expr; \
} \
} while (0)
class CheckTest : public testing::Test {};
......@@ -183,11 +183,11 @@ void DcheckEmptyFunction2() {}
class ScopedDcheckSeverity {
public:
ScopedDcheckSeverity(logging::LogSeverity new_severity)
: old_severity_(logging::LOG_DCHECK) {
logging::LOG_DCHECK = new_severity;
: old_severity_(logging::LOGGING_DCHECK) {
logging::LOGGING_DCHECK = new_severity;
}
~ScopedDcheckSeverity() { logging::LOG_DCHECK = old_severity_; }
~ScopedDcheckSeverity() { logging::LOGGING_DCHECK = old_severity_; }
private:
logging::LogSeverity old_severity_;
......@@ -202,10 +202,10 @@ class ScopedDcheckSeverity {
#endif
TEST_F(CheckTest, MAYBE_Dcheck) {
#if defined(DCHECK_IS_CONFIGURABLE)
// DCHECKs are enabled, and LOG_DCHECK is mutable, but defaults to non-fatal.
// Set it to LOG_FATAL to get the expected behavior from the rest of this
// test.
ScopedDcheckSeverity dcheck_severity(logging::LOG_FATAL);
// DCHECKs are enabled, and LOGGING_DCHECK is mutable, but defaults to
// non-fatal. Set it to LOGGING_FATAL to get the expected behavior from the
// rest of this test.
ScopedDcheckSeverity dcheck_severity(logging::LOGGING_FATAL);
#endif // defined(DCHECK_IS_CONFIGURABLE)
#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
......@@ -307,42 +307,42 @@ TEST_F(CheckTest, ConfigurableDCheck) {
// Verify that DCHECKs default to non-fatal in configurable-DCHECK builds.
// Note that we require only that DCHECK is non-fatal by default, rather
// than requiring that it be exactly INFO, ERROR, etc level.
EXPECT_LT(logging::LOG_DCHECK, logging::LOG_FATAL);
EXPECT_LT(logging::LOGGING_DCHECK, logging::LOGGING_FATAL);
DCHECK(false);
// Verify that DCHECK* aren't hard-wired to crash on failure.
logging::LOG_DCHECK = logging::LOG_INFO;
logging::LOGGING_DCHECK = logging::LOG_INFO;
DCHECK(false);
DCHECK_EQ(1, 2);
// Verify that DCHECK does crash if LOG_DCHECK is set to LOG_FATAL.
logging::LOG_DCHECK = logging::LOG_FATAL;
// Verify that DCHECK does crash if LOGGING_DCHECK is set to LOGGING_FATAL.
logging::LOGGING_DCHECK = logging::LOGGING_FATAL;
EXPECT_CHECK("Check failed: false. ", DCHECK(false));
EXPECT_CHECK("Check failed: 1 == 2 (1 vs. 2)", DCHECK_EQ(1, 2));
}
TEST_F(CheckTest, ConfigurableDCheckFeature) {
// Initialize FeatureList with and without DcheckIsFatal, and verify the
// value of LOG_DCHECK. Note that we don't require that DCHECK take a
// value of LOGGING_DCHECK. Note that we don't require that DCHECK take a
// specific value when the feature is off, only that it is non-fatal.
{
base::test::ScopedFeatureList feature_list;
feature_list.InitFromCommandLine("DcheckIsFatal", "");
EXPECT_EQ(logging::LOG_DCHECK, logging::LOG_FATAL);
EXPECT_EQ(logging::LOGGING_DCHECK, logging::LOGGING_FATAL);
}
{
base::test::ScopedFeatureList feature_list;
feature_list.InitFromCommandLine("", "DcheckIsFatal");
EXPECT_LT(logging::LOG_DCHECK, logging::LOG_FATAL);
EXPECT_LT(logging::LOGGING_DCHECK, logging::LOGGING_FATAL);
}
// The default case is last, so we leave LOG_DCHECK in the default state.
// The default case is last, so we leave LOGGING_DCHECK in the default state.
{
base::test::ScopedFeatureList feature_list;
feature_list.InitFromCommandLine("", "");
EXPECT_LT(logging::LOG_DCHECK, logging::LOG_FATAL);
EXPECT_LT(logging::LOGGING_DCHECK, logging::LOGGING_FATAL);
}
}
#endif // defined(DCHECK_IS_CONFIGURABLE)
......
base/feature_list.cc
View file @ 93dd4257
......@@ -437,7 +437,7 @@ void FeatureList::SetInstance(std::unique_ptr<FeatureList> instance) {
g_feature_list_instance = instance.release();
#if defined(DCHECK_IS_CONFIGURABLE)
// Update the behaviour of LOG_DCHECK to match the Feature configuration.
// Update the behaviour of LOGGING_DCHECK to match the Feature configuration.
// DCHECK is also forced to be FATAL if we are running a death-test.
// TODO(crbug.com/1057995#c11): --gtest_internal_run_death_test doesn't
// currently run through this codepath, mitigated in
......@@ -447,9 +447,9 @@ void FeatureList::SetInstance(std::unique_ptr<FeatureList> instance) {
if (FeatureList::IsEnabled(kDCheckIsFatalFeature) ||
CommandLine::ForCurrentProcess()->HasSwitch(
"gtest_internal_run_death_test")) {
logging::LOG_DCHECK = logging::LOG_FATAL;
logging::LOGGING_DCHECK = logging::LOG_FATAL;
} else {
logging::LOG_DCHECK = logging::LOG_INFO;
logging::LOGGING_DCHECK = logging::LOG_INFO;
}
#endif // defined(DCHECK_IS_CONFIGURABLE)
}
......
base/logging.cc
View file @ 93dd4257
......@@ -142,11 +142,11 @@ VlogInfo* g_vlog_info = nullptr;
VlogInfo* g_vlog_info_prev = nullptr;
const char* const log_severity_names[] = {"INFO", "WARNING", "ERROR", "FATAL"};
static_assert(LOG_NUM_SEVERITIES == base::size(log_severity_names),
static_assert(LOGGING_NUM_SEVERITIES == base::size(log_severity_names),
"Incorrect number of log_severity_names");
const char* log_severity_name(int severity) {
if (severity >= 0 && severity < LOG_NUM_SEVERITIES)
if (severity >= 0 && severity < LOGGING_NUM_SEVERITIES)
return log_severity_names[severity];
return "UNKNOWN";
}
......@@ -162,8 +162,8 @@ int g_logging_destination = LOG_DEFAULT;
LogFormat g_log_format = LogFormat::LOG_FORMAT_SYSLOG;
#endif
// For LOG_ERROR and above, always print to stderr.
const int kAlwaysPrintErrorLevel = LOG_ERROR;
// For LOGGING_ERROR and above, always print to stderr.
const int kAlwaysPrintErrorLevel = LOGGING_ERROR;
// Which log file to use? This is initialized by InitLogging or
// will be lazily initialized to the default value when it is
......@@ -347,10 +347,10 @@ void CloseLogFileUnlocked() {
} // namespace
#if defined(DCHECK_IS_CONFIGURABLE)
// In DCHECK-enabled Chrome builds, allow the meaning of LOG_DCHECK to be
// In DCHECK-enabled Chrome builds, allow the meaning of LOGGING_DCHECK to be
// determined at run-time. We default it to INFO, to avoid it triggering
// crashes before the run-time has explicitly chosen the behaviour.
BASE_EXPORT logging::LogSeverity LOG_DCHECK = LOG_INFO;
BASE_EXPORT logging::LogSeverity LOGGING_DCHECK = LOGGING_INFO;
#endif // defined(DCHECK_IS_CONFIGURABLE)
// This is never instantiated, it's just used for EAT_STREAM_PARAMETERS to have
......@@ -426,7 +426,7 @@ bool BaseInitLoggingImpl(const LoggingSettings& settings) {
return true;
}
#endif
DCHECK(settings.log_file_path) << "LOG_TO_FILE set but no log_file_path!";
if (!g_log_file_name)
......@@ -439,7 +439,7 @@ bool BaseInitLoggingImpl(const LoggingSettings& settings) {
}
void SetMinLogLevel(int level) {
g_min_log_level = std::min(LOG_FATAL, level);
g_min_log_level = std::min(LOGGING_FATAL, level);
}
int GetMinLogLevel() {
......@@ -548,7 +548,7 @@ LogMessage::LogMessage(const char* file, int line, LogSeverity severity)
}
LogMessage::LogMessage(const char* file, int line, const char* condition)
: severity_(LOG_FATAL), file_(file), line_(line) {
: severity_(LOGGING_FATAL), file_(file), line_(line) {
Init(file, line);
stream_ << "Check failed: " << condition << ". ";
}
......@@ -557,7 +557,7 @@ LogMessage::~LogMessage() {
size_t stack_start = stream_.tellp();
#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
!defined(OS_AIX)
if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) {
if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
// Include a stack trace on a fatal, unless a debugger is attached.
base::debug::StackTrace stack_trace;
stream_ << std::endl; // Newline to separate from log message.
......@@ -685,13 +685,13 @@ LogMessage::~LogMessage() {
#define ASL_LEVEL_STR(level) ASL_LEVEL_STR_X(level)
#define ASL_LEVEL_STR_X(level) #level
switch (severity) {
case LOG_INFO:
case LOGGING_INFO:
return ASL_LEVEL_STR(ASL_LEVEL_INFO);
case LOG_WARNING:
case LOGGING_WARNING:
return ASL_LEVEL_STR(ASL_LEVEL_WARNING);
case LOG_ERROR:
case LOGGING_ERROR:
return ASL_LEVEL_STR(ASL_LEVEL_ERR);
case LOG_FATAL:
case LOGGING_FATAL:
return ASL_LEVEL_STR(ASL_LEVEL_CRIT);
default:
return severity < 0 ? ASL_LEVEL_STR(ASL_LEVEL_DEBUG)
......@@ -725,13 +725,13 @@ LogMessage::~LogMessage() {
} log(main_bundle_id.empty() ? nullptr : main_bundle_id.c_str());
const os_log_type_t os_log_type = [](LogSeverity severity) {
switch (severity) {
case LOG_INFO:
case LOGGING_INFO:
return OS_LOG_TYPE_INFO;
case LOG_WARNING:
case LOGGING_WARNING:
return OS_LOG_TYPE_DEFAULT;
case LOG_ERROR:
case LOGGING_ERROR:
return OS_LOG_TYPE_ERROR;
case LOG_FATAL:
case LOGGING_FATAL:
return OS_LOG_TYPE_FAULT;
default:
return severity < 0 ? OS_LOG_TYPE_DEBUG : OS_LOG_TYPE_DEFAULT;
......@@ -745,16 +745,16 @@ LogMessage::~LogMessage() {
android_LogPriority priority =
(severity_ < 0) ? ANDROID_LOG_VERBOSE : ANDROID_LOG_UNKNOWN;
switch (severity_) {
case LOG_INFO:
case LOGGING_INFO:
priority = ANDROID_LOG_INFO;
break;
case LOG_WARNING:
case LOGGING_WARNING:
priority = ANDROID_LOG_WARN;
break;
case LOG_ERROR:
case LOGGING_ERROR:
priority = ANDROID_LOG_ERROR;
break;
case LOG_FATAL:
case LOGGING_FATAL:
priority = ANDROID_LOG_FATAL;
break;
}
......@@ -777,16 +777,16 @@ LogMessage::~LogMessage() {
#elif defined(OS_FUCHSIA)
fx_log_severity_t severity = FX_LOG_INFO;
switch (severity_) {
case LOG_INFO:
case LOGGING_INFO:
severity = FX_LOG_INFO;
break;
case LOG_WARNING:
case LOGGING_WARNING:
severity = FX_LOG_WARNING;
break;
case LOG_ERROR:
case LOGGING_ERROR:
severity = FX_LOG_ERROR;
break;
case LOG_FATAL:
case LOGGING_FATAL:
// Don't use FX_LOG_FATAL, otherwise fx_logger_log() will abort().
severity = FX_LOG_ERROR;
break;
......@@ -840,7 +840,7 @@ LogMessage::~LogMessage() {
}
}
if (severity_ == LOG_FATAL) {
if (severity_ == LOGGING_FATAL) {
// Write the log message to the global activity tracker, if running.
base::debug::GlobalActivityTracker* tracker =
base::debug::GlobalActivityTracker::Get();
......@@ -1109,7 +1109,7 @@ void RawLog(int level, const char* message) {
}
}
if (level == LOG_FATAL)
if (level == LOGGING_FATAL)
base::debug::BreakDebugger();
}
......
base/logging.h
View file @ 93dd4257
......@@ -349,40 +349,55 @@ typedef bool (*LogMessageHandlerFunction)(int severity,
BASE_EXPORT void SetLogMessageHandler(LogMessageHandlerFunction handler);
BASE_EXPORT LogMessageHandlerFunction GetLogMessageHandler();
typedef int LogSeverity;
const LogSeverity LOG_VERBOSE = -1; // This is level 1 verbosity
using LogSeverity = int;
const LogSeverity LOGGING_VERBOSE = -1; // This is level 1 verbosity
// Note: the log severities are used to index into the array of names,
// see log_severity_names.
const LogSeverity LOG_INFO = 0;
const LogSeverity LOG_WARNING = 1;
const LogSeverity LOG_ERROR = 2;
const LogSeverity LOG_FATAL = 3;
const LogSeverity LOG_NUM_SEVERITIES = 4;
const LogSeverity LOGGING_INFO = 0;
const LogSeverity LOGGING_WARNING = 1;
const LogSeverity LOGGING_ERROR = 2;
const LogSeverity LOGGING_FATAL = 3;
const LogSeverity LOGGING_NUM_SEVERITIES = 4;
// LOG_DFATAL is LOG_FATAL in debug mode, ERROR in normal mode
// LOGGING_DFATAL is LOGGING_FATAL in debug mode, ERROR in normal mode
#if defined(NDEBUG)
const LogSeverity LOG_DFATAL = LOG_ERROR;
const LogSeverity LOGGING_DFATAL = LOGGING_ERROR;
#else
const LogSeverity LOG_DFATAL = LOG_FATAL;
const LogSeverity LOGGING_DFATAL = LOGGING_FATAL;
#endif
// This block duplicates the above entries to facilitate incremental conversion
// from LOG_FOO to LOGGING_FOO.
// TODO(thestig): Convert existing users to LOGGING_FOO and remove this block.
const LogSeverity LOG_VERBOSE = LOGGING_VERBOSE;
const LogSeverity LOG_INFO = LOGGING_INFO;
const LogSeverity LOG_WARNING = LOGGING_WARNING;
const LogSeverity LOG_ERROR = LOGGING_ERROR;
const LogSeverity LOG_FATAL = LOGGING_FATAL;
const LogSeverity LOG_NUM_SEVERITIES = LOGGING_NUM_SEVERITIES;
const LogSeverity LOG_DFATAL = LOGGING_DFATAL;
// A few definitions of macros that don't generate much code. These are used
// by LOG() and LOG_IF, etc. Since these are used all over our code, it's
// better to have compact code for these operations.
#define COMPACT_GOOGLE_LOG_EX_INFO(ClassName, ...) \
::logging::ClassName(__FILE__, __LINE__, ::logging::LOG_INFO, ##__VA_ARGS__)
#define COMPACT_GOOGLE_LOG_EX_WARNING(ClassName, ...) \
::logging::ClassName(__FILE__, __LINE__, ::logging::LOG_WARNING, \
#define COMPACT_GOOGLE_LOG_EX_INFO(ClassName, ...) \
::logging::ClassName(__FILE__, __LINE__, ::logging::LOGGING_INFO, \
##__VA_ARGS__)
#define COMPACT_GOOGLE_LOG_EX_WARNING(ClassName, ...) \
::logging::ClassName(__FILE__, __LINE__, ::logging::LOGGING_WARNING, \
##__VA_ARGS__)
#define COMPACT_GOOGLE_LOG_EX_ERROR(ClassName, ...) \
::logging::ClassName(__FILE__, __LINE__, ::logging::LOGGING_ERROR, \
##__VA_ARGS__)
#define COMPACT_GOOGLE_LOG_EX_FATAL(ClassName, ...) \
::logging::ClassName(__FILE__, __LINE__, ::logging::LOGGING_FATAL, \
##__VA_ARGS__)
#define COMPACT_GOOGLE_LOG_EX_DFATAL(ClassName, ...) \
::logging::ClassName(__FILE__, __LINE__, ::logging::LOGGING_DFATAL, \
##__VA_ARGS__)
#define COMPACT_GOOGLE_LOG_EX_DCHECK(ClassName, ...) \
::logging::ClassName(__FILE__, __LINE__, ::logging::LOGGING_DCHECK, \
##__VA_ARGS__)
#define COMPACT_GOOGLE_LOG_EX_ERROR(ClassName, ...) \
::logging::ClassName(__FILE__, __LINE__, ::logging::LOG_ERROR, ##__VA_ARGS__)
#define COMPACT_GOOGLE_LOG_EX_FATAL(ClassName, ...) \
::logging::ClassName(__FILE__, __LINE__, ::logging::LOG_FATAL, ##__VA_ARGS__)
#define COMPACT_GOOGLE_LOG_EX_DFATAL(ClassName, ...) \
::logging::ClassName(__FILE__, __LINE__, ::logging::LOG_DFATAL, ##__VA_ARGS__)
#define COMPACT_GOOGLE_LOG_EX_DCHECK(ClassName, ...) \
::logging::ClassName(__FILE__, __LINE__, ::logging::LOG_DCHECK, ##__VA_ARGS__)
#define COMPACT_GOOGLE_LOG_INFO COMPACT_GOOGLE_LOG_EX_INFO(LogMessage)
#define COMPACT_GOOGLE_LOG_WARNING COMPACT_GOOGLE_LOG_EX_WARNING(LogMessage)
......@@ -402,14 +417,14 @@ const LogSeverity LOG_DFATAL = LOG_FATAL;
COMPACT_GOOGLE_LOG_EX_ERROR(ClassName , ##__VA_ARGS__)
#define COMPACT_GOOGLE_LOG_0 COMPACT_GOOGLE_LOG_ERROR
// Needed for LOG_IS_ON(ERROR).
const LogSeverity LOG_0 = LOG_ERROR;
const LogSeverity LOGGING_0 = LOGGING_ERROR;
#endif
// As special cases, we can assume that LOG_IS_ON(FATAL) always holds. Also,
// LOG_IS_ON(DFATAL) always holds in debug mode. In particular, CHECK()s will
// always fire if they fail.
#define LOG_IS_ON(severity) \
(::logging::ShouldCreateLogMessage(::logging::LOG_##severity))
(::logging::ShouldCreateLogMessage(::logging::LOGGING_##severity))
// We don't do any caching tricks with VLOG_IS_ON() like the
// google-glog version since it increases binary size. This means
......@@ -546,16 +561,16 @@ BASE_EXPORT extern std::ostream* g_swallow_stream;
#if DCHECK_IS_ON()
#if defined(DCHECK_IS_CONFIGURABLE)
BASE_EXPORT extern LogSeverity LOG_DCHECK;
BASE_EXPORT extern LogSeverity LOGGING_DCHECK;
#else
const LogSeverity LOG_DCHECK = LOG_FATAL;
const LogSeverity LOGGING_DCHECK = LOGGING_FATAL;
#endif // defined(DCHECK_IS_CONFIGURABLE)
#else // DCHECK_IS_ON()
// There may be users of LOG_DCHECK that are enabled independently
// There may be users of LOGGING_DCHECK that are enabled independently
// of DCHECK_IS_ON(), so default to FATAL logging for those.
const LogSeverity LOG_DCHECK = LOG_FATAL;
const LogSeverity LOGGING_DCHECK = LOGGING_FATAL;
#endif // DCHECK_IS_ON()
......@@ -576,7 +591,7 @@ class BASE_EXPORT LogMessage {
// Used for LOG(severity).
LogMessage(const char* file, int line, LogSeverity severity);
// Used for CHECK(). Implied severity = LOG_FATAL.
// Used for CHECK(). Implied severity = LOGGING_FATAL.
LogMessage(const char* file, int line, const char* condition);
LogMessage(const LogMessage&) = delete;
LogMessage& operator=(const LogMessage&) = delete;
......@@ -691,8 +706,7 @@ BASE_EXPORT FILE* DuplicateLogFILE();
BASE_EXPORT void RawLog(int level, const char* message);
#define RAW_LOG(level, message) \
::logging::RawLog(::logging::LOG_##level, message)
::logging::RawLog(::logging::LOGGING_##level, message)
#if defined(OS_WIN)
// Returns true if logging to file is enabled.
......
base/logging_unittest.cc
View file @ 93dd4257
......@@ -95,7 +95,7 @@ TEST_F(LoggingTest, BasicLogging) {
.Times(DCHECK_IS_ON() ? 16 : 8)
.WillRepeatedly(Return("log message"));
SetMinLogLevel(LOG_INFO);
SetMinLogLevel(LOGGING_INFO);
EXPECT_TRUE(LOG_IS_ON(INFO));
EXPECT_EQ(DCHECK_IS_ON(), DLOG_IS_ON(INFO));
......@@ -127,21 +127,21 @@ TEST_F(LoggingTest, LogIsOn) {
const bool kDfatalIsFatal = true;
#endif // defined(NDEBUG)
SetMinLogLevel(LOG_INFO);
SetMinLogLevel(LOGGING_INFO);
EXPECT_TRUE(LOG_IS_ON(INFO));
EXPECT_TRUE(LOG_IS_ON(WARNING));
EXPECT_TRUE(LOG_IS_ON(ERROR));
EXPECT_TRUE(LOG_IS_ON(FATAL));
EXPECT_TRUE(LOG_IS_ON(DFATAL));
SetMinLogLevel(LOG_WARNING);
SetMinLogLevel(LOGGING_WARNING);
EXPECT_FALSE(LOG_IS_ON(INFO));
EXPECT_TRUE(LOG_IS_ON(WARNING));
EXPECT_TRUE(LOG_IS_ON(ERROR));
EXPECT_TRUE(LOG_IS_ON(FATAL));
EXPECT_TRUE(LOG_IS_ON(DFATAL));
SetMinLogLevel(LOG_ERROR);
SetMinLogLevel(LOGGING_ERROR);
EXPECT_FALSE(LOG_IS_ON(INFO));
EXPECT_FALSE(LOG_IS_ON(WARNING));
EXPECT_TRUE(LOG_IS_ON(ERROR));
......@@ -149,7 +149,7 @@ TEST_F(LoggingTest, LogIsOn) {
EXPECT_TRUE(LOG_IS_ON(DFATAL));
// LOG_IS_ON(FATAL) should always be true.
SetMinLogLevel(LOG_FATAL + 1);
SetMinLogLevel(LOGGING_FATAL + 1);
EXPECT_FALSE(LOG_IS_ON(INFO));
EXPECT_FALSE(LOG_IS_ON(WARNING));
EXPECT_FALSE(LOG_IS_ON(ERROR));
......@@ -161,7 +161,7 @@ TEST_F(LoggingTest, LoggingIsLazyBySeverity) {
MockLogSource mock_log_source;
EXPECT_CALL(mock_log_source, Log()).Times(0);
SetMinLogLevel(LOG_WARNING);
SetMinLogLevel(LOGGING_WARNING);
EXPECT_FALSE(LOG_IS_ON(INFO));
EXPECT_FALSE(DLOG_IS_ON(INFO));
......@@ -774,7 +774,7 @@ TEST_F(LoggingTest, FuchsiaLogging) {
.Times(DCHECK_IS_ON() ? 2 : 1)
.WillRepeatedly(Return("log message"));
SetMinLogLevel(LOG_INFO);
SetMinLogLevel(LOGGING_INFO);
EXPECT_TRUE(LOG_IS_ON(INFO));
EXPECT_EQ(DCHECK_IS_ON(), DLOG_IS_ON(INFO));
......
base/logging_win.cc
View file @ 93dd4257
......@@ -30,16 +30,16 @@ bool LogEventProvider::LogMessage(logging::LogSeverity severity,
// Convert the log severity to the most appropriate ETW trace level.
if (severity >= 0) {
switch (severity) {
case LOG_INFO:
case LOGGING_INFO:
level = TRACE_LEVEL_INFORMATION;
break;
case LOG_WARNING:
case LOGGING_WARNING:
level = TRACE_LEVEL_WARNING;
break;
case LOG_ERROR:
case LOGGING_ERROR:
level = TRACE_LEVEL_ERROR;
break;
case LOG_FATAL:
case LOGGING_FATAL:
level = TRACE_LEVEL_FATAL;
break;
}
......@@ -117,13 +117,13 @@ void LogEventProvider::OnEventsEnabled() {
// and enable logging at that level.
EtwEventLevel level = enable_level();
if (level == TRACE_LEVEL_NONE || level == TRACE_LEVEL_FATAL) {
SetMinLogLevel(LOG_FATAL);
SetMinLogLevel(LOGGING_FATAL);
} else if (level == TRACE_LEVEL_ERROR) {
SetMinLogLevel(LOG_ERROR);
SetMinLogLevel(LOGGING_ERROR);
} else if (level == TRACE_LEVEL_WARNING) {
SetMinLogLevel(LOG_WARNING);
SetMinLogLevel(LOGGING_WARNING);
} else if (level == TRACE_LEVEL_INFORMATION) {
SetMinLogLevel(LOG_INFO);
SetMinLogLevel(LOGGING_INFO);
} else if (level >= TRACE_LEVEL_VERBOSE) {
// Above INFO, we enable verbose levels with negative severities.
SetMinLogLevel(TRACE_LEVEL_INFORMATION - level);
......
base/syslog_logging.cc
View file @ 93dd4257
......@@ -106,14 +106,14 @@ EventLogMessage::~EventLogMessage() {
std::string message(log_message_.str());
WORD log_type = EVENTLOG_ERROR_TYPE;
switch (log_message_.severity()) {
case LOG_INFO:
case LOGGING_INFO:
log_type = EVENTLOG_INFORMATION_TYPE;
break;
case LOG_WARNING:
case LOGGING_WARNING:
log_type = EVENTLOG_WARNING_TYPE;
break;
case LOG_ERROR:
case LOG_FATAL:
case LOGGING_ERROR:
case LOGGING_FATAL:
// The price of getting the stack trace is not worth the hassle for
// non-error conditions.
base::debug::StackTrace trace;
......@@ -143,16 +143,16 @@ EventLogMessage::~EventLogMessage() {
// See sys/syslog.h for reference.
int priority = 3;
switch (log_message_.severity()) {
case LOG_INFO:
case LOGGING_INFO:
priority = 6;
break;
case LOG_WARNING:
case LOGGING_WARNING:
priority = 4;
break;
case LOG_ERROR:
case LOGGING_ERROR:
priority = 3;
break;
case LOG_FATAL:
case LOGGING_FATAL:
priority = 2;
break;
}
......
base/test/test_suite.cc
View file @ 93dd4257
......@@ -614,7 +614,7 @@ void TestSuite::Initialize() {
// FeatureList::SetInstance() when/if OnTestStart() TestEventListeners
// are fixed to be invoked in the child process as expected.
if (command_line->HasSwitch("gtest_internal_run_death_test"))
logging::LOG_DCHECK = logging::LOG_FATAL;
logging::LOGGING_DCHECK = logging::LOG_FATAL;
#endif
#if defined(OS_IOS)
......
chrome/credential_provider/gaiacp/logging.h
View file @ 93dd4257
......@@ -33,7 +33,8 @@ class putHR {
// A helper macro which checks if the message should be logged based on log
// level.
#define LOG_ENABLED(LEVEL) (::logging::LOG_##LEVEL >= logging::GetMinLogLevel())
#define LOG_ENABLED(LEVEL) \
(::logging::LOGGING_##LEVEL >= logging::GetMinLogLevel())
// A macro that puts the function name into the logging stream. This is a
// drop-in replacement for the LOG macro.
......
content/renderer/render_process_impl.cc
View file @ 93dd4257
......@@ -80,7 +80,8 @@ GetThreadPoolInitParams() {
void V8DcheckCallbackHandler(const char* file, int line, const char* message) {
// TODO(siggi): Set a crash key or a breadcrumb so the fact that we hit a
// V8 DCHECK gets out in the crash report.
::logging::LogMessage(file, line, logging::LOG_DCHECK).stream() << message;
::logging::LogMessage(file, line, logging::LOGGING_DCHECK).stream()
<< message;
}
#endif // defined(DCHECK_IS_CONFIGURABLE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment