4 files changed, 60 insertions, 19 deletions

diff --git a/src/base/debug.cc b/src/base/debug.cc
index 2780344a4..6161c9e82 100644
--- a/src/base/debug.cc
+++ b/src/base/debug.cc
@@ -68,6 +68,8 @@ allFlags()
     return flags;
 }
 
+bool SimpleFlag::_active = false;
+
 Flag *
 findFlag(const std::string &name)
 {
@@ -95,17 +97,33 @@ Flag::~Flag()
 }
 
 void
+SimpleFlag::enableAll()
+{
+    _active = true;
+    for (auto& i : allFlags())
+        i.second->sync();
+}
+
+void
+SimpleFlag::disableAll()
+{
+    _active = false;
+    for (auto& i : allFlags())
+        i.second->sync();
+}
+
+void
 CompoundFlag::enable()
 {
-    SimpleFlag::enable();
-    for_each(_kids.begin(), _kids.end(), mem_fun(&Flag::enable));
+    for (auto& k : _kids)
+        k->enable();
 }
 
 void
 CompoundFlag::disable()
 {
-    SimpleFlag::disable();
-    for_each(_kids.begin(), _kids.end(), mem_fun(&Flag::disable));
+    for (auto& k : _kids)
+        k->disable();
 }
 
 struct AllFlags : public Flag
diff --git a/src/base/debug.hh b/src/base/debug.hh
index 5a03574f1..59a0b6efc 100644
--- a/src/base/debug.hh
+++ b/src/base/debug.hh
@@ -45,7 +45,6 @@ class Flag
   protected:
     const char *_name;
     const char *_desc;
-    std::vector<Flag *> _kids;
 
   public:
     Flag(const char *name, const char *desc);
@@ -53,33 +52,43 @@ class Flag
 
     std::string name() const { return _name; }
     std::string desc() const { return _desc; }
-    std::vector<Flag *> kids() { return _kids; }
+    virtual std::vector<Flag *> kids() { return std::vector<Flag*>(); }
 
     virtual void enable() = 0;
     virtual void disable() = 0;
+    virtual void sync() {}
 };
 
 class SimpleFlag : public Flag
 {
+    static bool _active; // whether debug tracings are enabled
   protected:
-    bool _status;
+    bool _tracing; // tracing is enabled and flag is on
+    bool _status;  // flag status
 
   public:
     SimpleFlag(const char *name, const char *desc)
         : Flag(name, desc), _status(false)
     { }
 
-    bool status() const { return _status; }
-    operator bool() const { return _status; }
-    bool operator!() const { return !_status; }
+    bool status() const { return _tracing; }
+    operator bool() const { return _tracing; }
+    bool operator!() const { return !_tracing; }
+
+    void enable()  { _status = true;  sync(); }
+    void disable() { _status = false; sync(); }
+
+    void sync() { _tracing = _active && _status; }
 
-    void enable() { _status = true; }
-    void disable() { _status = false; }
+    static void enableAll();
+    static void disableAll();
 };
 
-class CompoundFlag : public SimpleFlag
+class CompoundFlag : public Flag
 {
   protected:
+    std::vector<Flag *> _kids;
+
     void
     addFlag(Flag *f)
     {
@@ -99,7 +108,7 @@ class CompoundFlag : public SimpleFlag
         Flag *f14 = nullptr, Flag *f15 = nullptr,
         Flag *f16 = nullptr, Flag *f17 = nullptr,
         Flag *f18 = nullptr, Flag *f19 = nullptr)
-        : SimpleFlag(name, desc)
+        : Flag(name, desc)
     {
         addFlag(f00); addFlag(f01); addFlag(f02); addFlag(f03); addFlag(f04);
         addFlag(f05); addFlag(f06); addFlag(f07); addFlag(f08); addFlag(f09);
@@ -107,6 +116,8 @@ class CompoundFlag : public SimpleFlag
         addFlag(f15); addFlag(f16); addFlag(f17); addFlag(f18); addFlag(f19);
     }
 
+    std::vector<Flag *> kids() { return _kids; }
+
     void enable();
     void disable();
 };
diff --git a/src/base/trace.cc b/src/base/trace.cc
index 711d49655..ff1778249 100644
--- a/src/base/trace.cc
+++ b/src/base/trace.cc
@@ -39,6 +39,7 @@
 #include <sstream>
 #include <string>
 
+#include "base/debug.hh"
 #include "base/misc.hh"
 #include "base/output.hh"
 #include "base/str.hh"
@@ -54,8 +55,6 @@ const std::string &name()
 namespace Trace
 {
 
-bool enabled = false;
-
 // This variable holds the output logger for debug information.  Other
 // than setting up/redirecting this logger, do *NOT* reference this
 // directly
@@ -87,6 +86,18 @@ setDebugLogger(Logger *logger)
         debug_logger = logger;
 }
 
+void
+enable()
+{
+    Debug::SimpleFlag::enableAll();
+}
+
+void
+disable()
+{
+    Debug::SimpleFlag::disableAll();
+}
+
 ObjectMatch ignore;
 
 void
diff --git a/src/base/trace.hh b/src/base/trace.hh
index 70e85bf35..2b1d03eff 100644
--- a/src/base/trace.hh
+++ b/src/base/trace.hh
@@ -116,8 +116,9 @@ std::ostream &output();
 /** Delete the current global logger and assign a new one */
 void setDebugLogger(Logger *logger);
 
-/** Enable debug logging */
-extern bool enabled;
+/** Enable/disable debug logging */
+void enable();
+void disable();
 
 } // namespace Trace
 
@@ -160,7 +161,7 @@ class Named
 
 #if TRACING_ON
 
-#define DTRACE(x) ((Debug::x) && Trace::enabled)
+#define DTRACE(x) (Debug::x)
 
 #define DDUMP(x, data, count) do {                                        \
     using namespace Debug;                                                \