mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-14 15:46:28 +00:00
Namespace Log.h/cpp in dawn::
The LogMessage::LogMessage constructor was redefining a symbol that exists in re2 inside of Chromium. So we namespace Log inside dawn:: to avoid the conflict. BUG=dawn:302 Change-Id: Ida349208e2c6fe9ac032e1bd8cd442dff0b3f6bc Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/14320 Commit-Queue: Austin Eng <enga@chromium.org> Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
committed by
Commit Bot service account
parent
dd4584340d
commit
dc3317da6c
@@ -23,90 +23,94 @@
|
||||
# include <android/log.h>
|
||||
#endif
|
||||
|
||||
namespace {
|
||||
namespace dawn {
|
||||
|
||||
const char* SeverityName(LogSeverity severity) {
|
||||
switch (severity) {
|
||||
case LogSeverity::Debug:
|
||||
return "Debug";
|
||||
case LogSeverity::Info:
|
||||
return "Info";
|
||||
case LogSeverity::Warning:
|
||||
return "Warning";
|
||||
case LogSeverity::Error:
|
||||
return "Error";
|
||||
default:
|
||||
UNREACHABLE();
|
||||
return "";
|
||||
namespace {
|
||||
|
||||
const char* SeverityName(LogSeverity severity) {
|
||||
switch (severity) {
|
||||
case LogSeverity::Debug:
|
||||
return "Debug";
|
||||
case LogSeverity::Info:
|
||||
return "Info";
|
||||
case LogSeverity::Warning:
|
||||
return "Warning";
|
||||
case LogSeverity::Error:
|
||||
return "Error";
|
||||
default:
|
||||
UNREACHABLE();
|
||||
return "";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(DAWN_PLATFORM_ANDROID)
|
||||
android_LogPriority AndroidLogPriority(LogSeverity severity) {
|
||||
switch (severity) {
|
||||
case LogSeverity::Debug:
|
||||
return ANDROID_LOG_INFO;
|
||||
case LogSeverity::Info:
|
||||
return ANDROID_LOG_INFO;
|
||||
case LogSeverity::Warning:
|
||||
return ANDROID_LOG_WARN;
|
||||
case LogSeverity::Error:
|
||||
return ANDROID_LOG_ERROR;
|
||||
default:
|
||||
UNREACHABLE();
|
||||
return ANDROID_LOG_ERROR;
|
||||
android_LogPriority AndroidLogPriority(LogSeverity severity) {
|
||||
switch (severity) {
|
||||
case LogSeverity::Debug:
|
||||
return ANDROID_LOG_INFO;
|
||||
case LogSeverity::Info:
|
||||
return ANDROID_LOG_INFO;
|
||||
case LogSeverity::Warning:
|
||||
return ANDROID_LOG_WARN;
|
||||
case LogSeverity::Error:
|
||||
return ANDROID_LOG_ERROR;
|
||||
default:
|
||||
UNREACHABLE();
|
||||
return ANDROID_LOG_ERROR;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif // defined(DAWN_PLATFORM_ANDROID)
|
||||
|
||||
} // anonymous namespace
|
||||
} // anonymous namespace
|
||||
|
||||
LogMessage::LogMessage(LogSeverity severity) : mSeverity(severity) {
|
||||
}
|
||||
|
||||
LogMessage::~LogMessage() {
|
||||
std::string fullMessage = mStream.str();
|
||||
|
||||
// If this message has been moved, its stream is empty.
|
||||
if (fullMessage.empty()) {
|
||||
return;
|
||||
LogMessage::LogMessage(LogSeverity severity) : mSeverity(severity) {
|
||||
}
|
||||
|
||||
const char* severityName = SeverityName(mSeverity);
|
||||
LogMessage::~LogMessage() {
|
||||
std::string fullMessage = mStream.str();
|
||||
|
||||
FILE* outputStream = stdout;
|
||||
if (mSeverity == LogSeverity::Warning || mSeverity == LogSeverity::Error) {
|
||||
outputStream = stderr;
|
||||
}
|
||||
// If this message has been moved, its stream is empty.
|
||||
if (fullMessage.empty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
const char* severityName = SeverityName(mSeverity);
|
||||
|
||||
FILE* outputStream = stdout;
|
||||
if (mSeverity == LogSeverity::Warning || mSeverity == LogSeverity::Error) {
|
||||
outputStream = stderr;
|
||||
}
|
||||
|
||||
#if defined(DAWN_PLATFORM_ANDROID)
|
||||
android_LogPriority androidPriority = AndroidLogPriority(mSeverity);
|
||||
__android_log_print(androidPriority, "Dawn", "%s: %s\n", severityName, fullMessage.c_str());
|
||||
android_LogPriority androidPriority = AndroidLogPriority(mSeverity);
|
||||
__android_log_print(androidPriority, "Dawn", "%s: %s\n", severityName, fullMessage.c_str());
|
||||
#else // defined(DAWN_PLATFORM_ANDROID)
|
||||
// Note: we use fprintf because <iostream> includes static initializers.
|
||||
fprintf(outputStream, "%s: %s\n", severityName, fullMessage.c_str());
|
||||
fflush(outputStream);
|
||||
// Note: we use fprintf because <iostream> includes static initializers.
|
||||
fprintf(outputStream, "%s: %s\n", severityName, fullMessage.c_str());
|
||||
fflush(outputStream);
|
||||
#endif // defined(DAWN_PLATFORM_ANDROID)
|
||||
}
|
||||
}
|
||||
|
||||
LogMessage DebugLog() {
|
||||
return {LogSeverity::Debug};
|
||||
}
|
||||
LogMessage DebugLog() {
|
||||
return {LogSeverity::Debug};
|
||||
}
|
||||
|
||||
LogMessage InfoLog() {
|
||||
return {LogSeverity::Info};
|
||||
}
|
||||
LogMessage InfoLog() {
|
||||
return {LogSeverity::Info};
|
||||
}
|
||||
|
||||
LogMessage WarningLog() {
|
||||
return {LogSeverity::Warning};
|
||||
}
|
||||
LogMessage WarningLog() {
|
||||
return {LogSeverity::Warning};
|
||||
}
|
||||
|
||||
LogMessage ErrorLog() {
|
||||
return {LogSeverity::Error};
|
||||
}
|
||||
LogMessage ErrorLog() {
|
||||
return {LogSeverity::Error};
|
||||
}
|
||||
|
||||
LogMessage DebugLog(const char* file, const char* function, int line) {
|
||||
LogMessage message = DebugLog();
|
||||
message << file << ":" << line << "(" << function << ")";
|
||||
return message;
|
||||
}
|
||||
LogMessage DebugLog(const char* file, const char* function, int line) {
|
||||
LogMessage message = DebugLog();
|
||||
message << file << ":" << line << "(" << function << ")";
|
||||
return message;
|
||||
}
|
||||
|
||||
} // namespace dawn
|
||||
|
||||
Reference in New Issue
Block a user