From a34cf0bb795bdcf1d4a709e3d9bbfb01b310c451 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 10 Mar 2013 22:31:47 -0700 Subject: [PATCH] Add a VERBOSE logging level, for noisy logging. The debug log is hard to look at because it has so much unneeded info. --- Common/Log.h | 13 ++++++++----- Common/LogManager.cpp | 2 +- android/jni/NativeApp.cpp | 1 + headless/Headless.cpp | 3 +++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Common/Log.h b/Common/Log.h index b027fc2962..c01835df7d 100644 --- a/Common/Log.h +++ b/Common/Log.h @@ -22,6 +22,7 @@ #define WARNING_LEVEL 3 // Something is suspicious. #define INFO_LEVEL 4 // General information. #define DEBUG_LEVEL 5 // Detailed debugging - might make things slow. +#define VERBOSE_LEVEL 6 // Noisy debugging - sometimes needed but usually unimportant. #if !defined(_WIN32) && !defined(PANDORA) #include @@ -64,6 +65,7 @@ enum LOG_LEVELS { LWARNING = WARNING_LEVEL, LINFO = INFO_LEVEL, LDEBUG = DEBUG_LEVEL, + LVERBOSE = VERBOSE_LEVEL, }; #define LOGTYPES_LEVELS LogTypes::LOG_LEVELS @@ -92,11 +94,12 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, GenericLog(v, t, __FILE__, __LINE__, __VA_ARGS__); \ } -#define ERROR_LOG(t,...) { GENERIC_LOG(LogTypes::t, LogTypes::LERROR, __VA_ARGS__) } -#define WARN_LOG(t,...) { GENERIC_LOG(LogTypes::t, LogTypes::LWARNING, __VA_ARGS__) } -#define NOTICE_LOG(t,...) { GENERIC_LOG(LogTypes::t, LogTypes::LNOTICE, __VA_ARGS__) } -#define INFO_LOG(t,...) { GENERIC_LOG(LogTypes::t, LogTypes::LINFO, __VA_ARGS__) } -#define DEBUG_LOG(t,...) { GENERIC_LOG(LogTypes::t, LogTypes::LDEBUG, __VA_ARGS__) } +#define ERROR_LOG(t,...) { GENERIC_LOG(LogTypes::t, LogTypes::LERROR, __VA_ARGS__) } +#define WARN_LOG(t,...) { GENERIC_LOG(LogTypes::t, LogTypes::LWARNING, __VA_ARGS__) } +#define NOTICE_LOG(t,...) { GENERIC_LOG(LogTypes::t, LogTypes::LNOTICE, __VA_ARGS__) } +#define INFO_LOG(t,...) { GENERIC_LOG(LogTypes::t, LogTypes::LINFO, __VA_ARGS__) } +#define DEBUG_LOG(t,...) { GENERIC_LOG(LogTypes::t, LogTypes::LDEBUG, __VA_ARGS__) } +#define VERBOSE_LOG(t,...) { GENERIC_LOG(LogTypes::t, LogTypes::LVERBOSE, __VA_ARGS__) } #if MAX_LOGLEVEL >= DEBUG_LEVEL #define _dbg_assert_(_t_, _a_) \ diff --git a/Common/LogManager.cpp b/Common/LogManager.cpp index 1159a75c32..3b0d6d0974 100644 --- a/Common/LogManager.cpp +++ b/Common/LogManager.cpp @@ -168,7 +168,7 @@ void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const if (!log || !log->IsEnabled() || level > log->GetLevel() || ! log->HasListeners()) return; - static const char level_to_char[7] = "-NEWID"; + static const char level_to_char[8] = "-NEWIDV"; char formattedTime[13]; Common::Timer::GetTimeFormatted(formattedTime); diff --git a/android/jni/NativeApp.cpp b/android/jni/NativeApp.cpp index 1d1e9a4872..715bcb3900 100644 --- a/android/jni/NativeApp.cpp +++ b/android/jni/NativeApp.cpp @@ -65,6 +65,7 @@ public: { switch (level) { + case LogTypes::LVERBOSE: case LogTypes::LDEBUG: case LogTypes::LINFO: ILOG("%s", msg); diff --git a/headless/Headless.cpp b/headless/Headless.cpp index 96ddf00612..adefaaf352 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -27,6 +27,9 @@ public: { switch (level) { + case LogTypes::LVERBOSE: + fprintf(stderr, "V %s", msg); + break; case LogTypes::LDEBUG: fprintf(stderr, "D %s", msg); break;