[Lldb-commits] [lldb] r294244 - Remove verbose category in the kdp channel

[Pavel Labath via lldb-commits]

Author: labath
Date: Mon Feb  6 15:46:22 2017
New Revision: 294244

URL: http://llvm.org/viewvc/llvm-project?rev=294244&view=rev
Log:
Remove verbose category in the kdp channel

Modified:
    lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp
    lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
    lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp
    lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h

Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp?rev=294244&r1=294243&r2=294244&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp (original)
+++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp Mon Feb  6 15:46:22 2017
@@ -200,8 +200,7 @@ size_t CommunicationKDP::WaitForPacketWi
   uint8_t buffer[8192];
   Error error;
 
-  Log *log(ProcessKDPLog::GetLogIfAllCategoriesSet(KDP_LOG_PACKETS |
-                                                   KDP_LOG_VERBOSE));
+  Log *log(ProcessKDPLog::GetLogIfAllCategoriesSet(KDP_LOG_PACKETS));
 
   // Check for a packet from our cache first without trying any reading...
   if (CheckForPacket(NULL, 0, packet))
@@ -216,12 +215,12 @@ size_t CommunicationKDP::WaitForPacketWi
                                  : std::chrono::microseconds(timeout_usec),
                              status, &error);
 
-    if (log)
-      log->Printf("%s: Read (buffer, (sizeof(buffer), timeout_usec = 0x%x, "
-                  "status = %s, error = %s) => bytes_read = %" PRIu64,
-                  LLVM_PRETTY_FUNCTION, timeout_usec,
+    LLDB_LOGV(log, 
+      "Read (buffer, sizeof(buffer), timeout_usec = 0x{0:x}, "
+                  "status = {1}, error = {2}) => bytes_read = {4}",
+                  timeout_usec,
                   Communication::ConnectionStatusAsCString(status),
-                  error.AsCString(), (uint64_t)bytes_read);
+                  error, bytes_read);
 
     if (bytes_read > 0) {
       if (CheckForPacket(buffer, bytes_read, packet))

Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp?rev=294244&r1=294243&r2=294244&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp (original)
+++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp Mon Feb  6 15:46:22 2017
@@ -518,8 +518,7 @@ bool ProcessKDP::UpdateThreadList(Thread
                                   ThreadList &new_thread_list) {
   // locker will keep a mutex locked until it goes out of scope
   Log *log(ProcessKDPLog::GetLogIfAllCategoriesSet(KDP_LOG_THREAD));
-  if (log && log->GetMask().Test(KDP_LOG_VERBOSE))
-    log->Printf("ProcessKDP::%s (pid = %" PRIu64 ")", __FUNCTION__, GetID());
+  LLDB_LOGV(log, "pid = {0}", GetID());
 
   // Even though there is a CPU mask, it doesn't mean we can see each CPU
   // individually, there is really only one. Lets call this thread 1.

Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp?rev=294244&r1=294243&r2=294244&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp (original)
+++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.cpp Mon Feb  6 15:46:22 2017
@@ -73,8 +73,6 @@ void ProcessKDPLog::DisableLog(const cha
           flag_bits &= ~KDP_LOG_STEP;
         else if (::strcasecmp(arg, "thread") == 0)
           flag_bits &= ~KDP_LOG_THREAD;
-        else if (::strcasecmp(arg, "verbose") == 0)
-          flag_bits &= ~KDP_LOG_VERBOSE;
         else if (::strncasecmp(arg, "watch", 5) == 0)
           flag_bits &= ~KDP_LOG_WATCHPOINTS;
         else {
@@ -138,8 +136,6 @@ Log *ProcessKDPLog::EnableLog(StreamSP &
         flag_bits |= KDP_LOG_STEP;
       else if (::strcasecmp(arg, "thread") == 0)
         flag_bits |= KDP_LOG_THREAD;
-      else if (::strcasecmp(arg, "verbose") == 0)
-        flag_bits |= KDP_LOG_VERBOSE;
       else if (::strncasecmp(arg, "watch", 5) == 0)
         flag_bits |= KDP_LOG_WATCHPOINTS;
       else {

Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h?rev=294244&r1=294243&r2=294244&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h (original)
+++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDPLog.h Mon Feb  6 15:46:22 2017
@@ -17,7 +17,6 @@
 // Project includes
 #include "lldb/Core/Log.h"
 
-#define KDP_LOG_VERBOSE (1u << 0)
 #define KDP_LOG_PROCESS (1u << 1)
 #define KDP_LOG_THREAD (1u << 2)
 #define KDP_LOG_PACKETS (1u << 3)