Skip to content

S
swiftshader
Commit 196d8177 by Ben Clayton
Options

Debug: Rename levels.

`DEBUG` has been defined by some projects as a preprocessor macro. Rename to fix builds. Fixes: b/149238449 Change-Id: I9a77321504c7097a5c59dde8b918b52650a90c0f Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/41050Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Tested-by: 's avatarBen Clayton <bclayton@google.com>
parent b3b2a4fc
Showing with 42 additions and 42 deletions
src/Reactor/Debug.cpp
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#endif #endif
#ifndef REACTOR_LOGGING_LEVEL #ifndef REACTOR_LOGGING_LEVEL
# define REACTOR_LOGGING_LEVEL INFO # define REACTOR_LOGGING_LEVEL Info
#endif #endif
namespace { namespace {
...@@ -98,11 +98,11 @@ bool IsUnderDebugger() ...@@ -98,11 +98,11 @@ bool IsUnderDebugger()
enum class Level enum class Level
{ {
DEBUG, Debug,
INFO, Info,
WARN, Warn,
ERROR, Error,
FATAL, Fatal,
}; };
#ifdef __ANDROID__ #ifdef __ANDROID__
...@@ -110,19 +110,19 @@ void logv_android(Level level, const char *msg) ...@@ -110,19 +110,19 @@ void logv_android(Level level, const char *msg)
{ {
switch(level) switch(level)
{ {
case Level::DEBUG: case Level::Debug:
__android_log_write(ANDROID_LOG_DEBUG, "SwiftShader", msg); __android_log_write(ANDROID_LOG_DEBUG, "SwiftShader", msg);
break; break;
case Level::INFO: case Level::Info:
__android_log_write(ANDROID_LOG_INFO, "SwiftShader", msg); __android_log_write(ANDROID_LOG_INFO, "SwiftShader", msg);
break; break;
case Level::WARN: case Level::Warn:
__android_log_write(ANDROID_LOG_WARN, "SwiftShader", msg); __android_log_write(ANDROID_LOG_WARN, "SwiftShader", msg);
break; break;
case Level::ERROR: case Level::Error:
__android_log_write(ANDROID_LOG_ERROR, "SwiftShader", msg); __android_log_write(ANDROID_LOG_ERROR, "SwiftShader", msg);
break; break;
case Level::FATAL: case Level::Fatal:
__android_log_write(ANDROID_LOG_FATAL, "SwiftShader", msg); __android_log_write(ANDROID_LOG_FATAL, "SwiftShader", msg);
break; break;
} }
...@@ -132,13 +132,13 @@ void logv_std(Level level, const char *msg) ...@@ -132,13 +132,13 @@ void logv_std(Level level, const char *msg)
{ {
switch(level) switch(level)
{ {
case Level::DEBUG: case Level::Debug:
case Level::INFO: case Level::Info:
fprintf(stdout, "%s", msg); fprintf(stdout, "%s", msg);
break; break;
case Level::WARN: case Level::Warn:
case Level::ERROR: case Level::Error:
case Level::FATAL: case Level::Fatal:
fprintf(stderr, "%s", msg); fprintf(stderr, "%s", msg);
break; break;
} }
...@@ -187,7 +187,7 @@ void trace(const char *format, ...) ...@@ -187,7 +187,7 @@ void trace(const char *format, ...)
{ {
va_list vararg; va_list vararg;
va_start(vararg, format); va_start(vararg, format);
logv(Level::DEBUG, format, vararg); logv(Level::Debug, format, vararg);
va_end(vararg); va_end(vararg);
} }
...@@ -195,7 +195,7 @@ void warn(const char *format, ...) ...@@ -195,7 +195,7 @@ void warn(const char *format, ...)
{ {
va_list vararg; va_list vararg;
va_start(vararg, format); va_start(vararg, format);
logv(Level::WARN, format, vararg); logv(Level::Warn, format, vararg);
va_end(vararg); va_end(vararg);
} }
...@@ -204,7 +204,7 @@ void abort(const char *format, ...) ...@@ -204,7 +204,7 @@ void abort(const char *format, ...)
va_list vararg; va_list vararg;
va_start(vararg, format); va_start(vararg, format);
logv(Level::FATAL, format, vararg); logv(Level::Fatal, format, vararg);
va_end(vararg); va_end(vararg);
::abort(); ::abort();
...@@ -218,7 +218,7 @@ void trace_assert(const char *format, ...) ...@@ -218,7 +218,7 @@ void trace_assert(const char *format, ...)
// Abort after tracing and printing to stderr // Abort after tracing and printing to stderr
va_list vararg; va_list vararg;
va_start(vararg, format); va_start(vararg, format);
logv(Level::FATAL, format, vararg); logv(Level::Fatal, format, vararg);
va_end(vararg); va_end(vararg);
::abort(); ::abort();
...@@ -227,7 +227,7 @@ void trace_assert(const char *format, ...) ...@@ -227,7 +227,7 @@ void trace_assert(const char *format, ...)
{ {
va_list vararg; va_list vararg;
va_start(vararg, format); va_start(vararg, format);
logv(Level::FATAL, format, vararg); logv(Level::Fatal, format, vararg);
va_end(vararg); va_end(vararg);
} }
} }
......
src/System/Debug.cpp
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#endif #endif
#ifndef SWIFTSHADER_LOGGING_LEVEL #ifndef SWIFTSHADER_LOGGING_LEVEL
# define SWIFTSHADER_LOGGING_LEVEL INFO # define SWIFTSHADER_LOGGING_LEVEL Info
#endif #endif
namespace { namespace {
...@@ -98,11 +98,11 @@ bool IsUnderDebugger() ...@@ -98,11 +98,11 @@ bool IsUnderDebugger()
enum class Level enum class Level
{ {
DEBUG, Debug,
INFO, Info,
WARN, Warn,
ERROR, Error,
FATAL, Fatal,
}; };
#ifdef __ANDROID__ #ifdef __ANDROID__
...@@ -110,19 +110,19 @@ void logv_android(Level level, const char *msg) ...@@ -110,19 +110,19 @@ void logv_android(Level level, const char *msg)
{ {
switch(level) switch(level)
{ {
case Level::DEBUG: case Level::Debug:
__android_log_write(ANDROID_LOG_DEBUG, "SwiftShader", msg); __android_log_write(ANDROID_LOG_DEBUG, "SwiftShader", msg);
break; break;
case Level::INFO: case Level::Info:
__android_log_write(ANDROID_LOG_INFO, "SwiftShader", msg); __android_log_write(ANDROID_LOG_INFO, "SwiftShader", msg);
break; break;
case Level::WARN: case Level::Warn:
__android_log_write(ANDROID_LOG_WARN, "SwiftShader", msg); __android_log_write(ANDROID_LOG_WARN, "SwiftShader", msg);
break; break;
case Level::ERROR: case Level::Error:
__android_log_write(ANDROID_LOG_ERROR, "SwiftShader", msg); __android_log_write(ANDROID_LOG_ERROR, "SwiftShader", msg);
break; break;
case Level::FATAL: case Level::Fatal:
__android_log_write(ANDROID_LOG_FATAL, "SwiftShader", msg); __android_log_write(ANDROID_LOG_FATAL, "SwiftShader", msg);
break; break;
} }
...@@ -132,13 +132,13 @@ void logv_std(Level level, const char *msg) ...@@ -132,13 +132,13 @@ void logv_std(Level level, const char *msg)
{ {
switch(level) switch(level)
{ {
case Level::DEBUG: case Level::Debug:
case Level::INFO: case Level::Info:
fprintf(stdout, "%s", msg); fprintf(stdout, "%s", msg);
break; break;
case Level::WARN: case Level::Warn:
case Level::ERROR: case Level::Error:
case Level::FATAL: case Level::Fatal:
fprintf(stderr, "%s", msg); fprintf(stderr, "%s", msg);
break; break;
} }
...@@ -187,7 +187,7 @@ void trace(const char *format, ...) ...@@ -187,7 +187,7 @@ void trace(const char *format, ...)
{ {
va_list vararg; va_list vararg;
va_start(vararg, format); va_start(vararg, format);
logv(Level::DEBUG, format, vararg); logv(Level::Debug, format, vararg);
va_end(vararg); va_end(vararg);
} }
...@@ -195,7 +195,7 @@ void warn(const char *format, ...) ...@@ -195,7 +195,7 @@ void warn(const char *format, ...)
{ {
va_list vararg; va_list vararg;
va_start(vararg, format); va_start(vararg, format);
logv(Level::WARN, format, vararg); logv(Level::Warn, format, vararg);
va_end(vararg); va_end(vararg);
} }
...@@ -204,7 +204,7 @@ void abort(const char *format, ...) ...@@ -204,7 +204,7 @@ void abort(const char *format, ...)
va_list vararg; va_list vararg;
va_start(vararg, format); va_start(vararg, format);
logv(Level::FATAL, format, vararg); logv(Level::Fatal, format, vararg);
va_end(vararg); va_end(vararg);
::abort(); ::abort();
...@@ -218,7 +218,7 @@ void trace_assert(const char *format, ...) ...@@ -218,7 +218,7 @@ void trace_assert(const char *format, ...)
// Abort after tracing and printing to stderr // Abort after tracing and printing to stderr
va_list vararg; va_list vararg;
va_start(vararg, format); va_start(vararg, format);
logv(Level::FATAL, format, vararg); logv(Level::Fatal, format, vararg);
va_end(vararg); va_end(vararg);
::abort(); ::abort();
...@@ -227,7 +227,7 @@ void trace_assert(const char *format, ...) ...@@ -227,7 +227,7 @@ void trace_assert(const char *format, ...)
{ {
va_list vararg; va_list vararg;
va_start(vararg, format); va_start(vararg, format);
logv(Level::FATAL, format, vararg); logv(Level::Fatal, format, vararg);
va_end(vararg); va_end(vararg);
} }
} }
......
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