Changeset 3074

Timestamp:

23/01/2012 01:32:08 (4 months ago)

Author:

chris

Message:

Allow overriding Logging::Guard to dump stack backtraces as well.

Location:

box/trunk/lib/common

Files:

• Box.h (modified) (3 diffs)
• Logging.cpp (modified) (1 diff)
• Logging.h (modified) (2 diffs)

box/trunk/lib/common/Box.h

@@ -17 +17 @@
 
 #include "BoxPlatform.h"
+
+#include <memory>
 
 // uncomment this line to enable full memory leak finding on all
@@ -105 +107 @@
         { \
                 if(!HideExceptionMessageGuard::ExceptionsHidden() \
-                        || Logging::IsEnabled(Log::EVERYTHING)) \
+                        || Logging::Guard::IsGuardingFrom(Log::EVERYTHING)) \
                 { \
+                        std::auto_ptr<Logging::Guard> guard; \
+                        \
+                        if(Logging::Guard::IsGuardingFrom(Log::EVERYTHING)) \
+                        { \
+                                guard.reset(new Logging::Guard(Log::EVERYTHING)); \
+                        } \
+                        \
                         OPTIONAL_DO_BACKTRACE \
                         BOX_WARNING("Exception thrown: " \
@@ -120 +129 @@
                 _box_throw_line << message; \
                 if(!HideExceptionMessageGuard::ExceptionsHidden() \
-                        || Logging::IsEnabled(Log::EVERYTHING)) \
+                        || Logging::Guard::IsGuardingFrom(Log::EVERYTHING)) \
                 { \
+                        std::auto_ptr<Logging::Guard> guard; \
+                        \
+                        if(Logging::Guard::IsGuardingFrom(Log::EVERYTHING)) \
+                        { \
+                                guard.reset(new Logging::Guard(Log::EVERYTHING)); \
+                        } \
+                        \
                         OPTIONAL_DO_BACKTRACE \
                         BOX_WARNING("Exception thrown: " \

box/trunk/lib/common/Logging.cpp

@@ -46 +46 @@
 Logging     Logging::sGlobalLogging; //automatic initialisation
 std::string Logging::sProgramName;
+
+int Logging::Guard::sGuardCount = 0;
+Log::Level Logging::Guard::sOriginalLevel = Log::INVALID;
 
 Logging::Logging()

box/trunk/lib/common/Logging.h

@@ -304 +304 @@
                 private:
                 Log::Level mOldLevel;
+                static int sGuardCount;
+                static Log::Level sOriginalLevel;
 
                 public:
@@ -309 +311 @@
                 {
                         mOldLevel = Logging::GetGlobalLevel();
+                        if(sGuardCount == 0)
+                        {
+                                sOriginalLevel = mOldLevel;
+                        }
+                        sGuardCount++;
                         Logging::SetGlobalLevel(newLevel);
                 }
                 ~Guard()
                 {
+                        sGuardCount--;
                         Logging::SetGlobalLevel(mOldLevel);
+                }
+
+                static bool IsActive() { return (sGuardCount > 0); }
+                static Log::Level GetOriginalLevel() { return sOriginalLevel; }
+                static bool IsGuardingFrom(Log::Level originalLevel)
+                {
+                        return IsActive() &&
+                                (int)sOriginalLevel >= (int)originalLevel;
                 }
         };