Add the ability to disable individual log categories, rather

than just the entire log channel.

Add checks, where appropriate, to make sure a log channel/category has 
not been disabled before attempting to write to it.

llvm-svn: 117715

3 files changed, 8 insertions, 0 deletions

diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index ce072ed8cb4..b6537276ffa 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -249,6 +249,7 @@ Process::WaitForStateChangedEvents (const TimeValue *timeout, EventSP &event_sp)
                                                        event_sp))
         state = Process::ProcessEventData::GetStateFromEvent(event_sp.get());
 
+    log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS);
     if (log)
         log->Printf ("Process::%s (timeout = %p, event_sp) => %s",
                      __FUNCTION__,
@@ -268,6 +269,7 @@ Process::PeekAtStateChangedEvents ()
     Event *event_ptr;
     event_ptr = m_listener.PeekAtNextEventForBroadcasterWithType (this,
                                                                   eBroadcastBitStateChanged);
+    log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS);
     if (log)
     {
         if (event_ptr)
@@ -1640,6 +1642,8 @@ Process::RunPrivateStateThread ()
             break;
     }
 
+    // Verify log is still enabled before attempting to write to it...
+    log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS);
     if (log)
         log->Printf ("Process::%s (arg = %p, pid = %i) thread exiting...", __FUNCTION__, this, GetID());
 
diff --git a/lldb/source/Target/ThreadPlanStepInRange.cpp b/lldb/source/Target/ThreadPlanStepInRange.cpp
index 92f78bbd14b..2be93808f2a 100644
--- a/lldb/source/Target/ThreadPlanStepInRange.cpp
+++ b/lldb/source/Target/ThreadPlanStepInRange.cpp
@@ -156,6 +156,7 @@ ThreadPlanStepInRange::ShouldStop (Event *event_ptr)
             if (bytes_to_skip != 0)
             {
                 func_start_address.Slide (bytes_to_skip);
+                log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP);
                 if (log)
                     log->Printf ("Pushing past prologue ");
                     
diff --git a/lldb/source/Target/ThreadPlanTestCondition.cpp b/lldb/source/Target/ThreadPlanTestCondition.cpp
index d66fff7bca5..68d4a8af9d6 100644
--- a/lldb/source/Target/ThreadPlanTestCondition.cpp
+++ b/lldb/source/Target/ThreadPlanTestCondition.cpp
@@ -89,11 +89,13 @@ ThreadPlanTestCondition::ShouldStop (Event *event_ptr)
                 else
                     m_did_stop = true;
             }
+            log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP);
             if (log)
                 log->Printf("Condition successfully evaluated, result is %s.\n", m_did_stop ? "true" : "false");
         }
         else
         {
+            log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP);
             if (log)
                 log->Printf("Failed to get a result from the expression, error: \"%s\"\n", error_stream.GetData());
             m_did_stop = true;
@@ -101,6 +103,7 @@ ThreadPlanTestCondition::ShouldStop (Event *event_ptr)
     }
     else if (m_exe_ctx.thread->WasThreadPlanDiscarded (m_expression_plan_sp.get()))
     {
+        log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP);
         if (log)
             log->Printf("ExecuteExpression thread plan was discarded.\n");
         m_did_stop = true;