[Lldb-commits] [lldb] r155179 - in /lldb/branches/lldb-platform-work: ./ source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp

[Johnny Chen]

Author: johnny
Date: Thu Apr 19 19:18:19 2012
New Revision: 155179

URL: http://llvm.org/viewvc/llvm-project?rev=155179&view=rev
Log:
Merge changes from ToT:

svn merge -r 155170:155175 https://johnny@llvm.org/svn/llvm-project/lldb/trunk .

Modified:
    lldb/branches/lldb-platform-work/   (props changed)
    lldb/branches/lldb-platform-work/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp

Propchange: lldb/branches/lldb-platform-work/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 19 19:18:19 2012
@@ -1 +1 @@
-/lldb/trunk:154224-155170
+/lldb/trunk:154224-155175

Modified: lldb/branches/lldb-platform-work/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp?rev=155179&r1=155178&r2=155179&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp (original)
+++ lldb/branches/lldb-platform-work/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp Thu Apr 19 19:18:19 2012
@@ -452,7 +452,7 @@
             StreamString strm;
             gdb_comm.DumpHistory(strm);
             Host::SetCrashDescription (strm.GetData());
-            assert (!"Didn't get sequence mutex.");
+            assert (!"Didn't get sequence mutex for write register.");
 #else
             if (log)
             {
@@ -529,7 +529,7 @@
         StreamString strm;
         gdb_comm.DumpHistory(strm);
         Host::SetCrashDescription (strm.GetData());
-        assert (!"Didn't get sequence mutex.");
+        assert (!"Didn't get sequence mutex for read all registers.");
 #else
         if (log)
         {
@@ -665,19 +665,24 @@
     else
     {
         LogSP log (ProcessGDBRemoteLog::GetLogIfAnyCategoryIsSet (GDBR_LOG_THREAD | GDBR_LOG_PACKETS));
-        if (1 /* log */)
+#if LLDB_CONFIGURATION_DEBUG
+        StreamString strm;
+        gdb_comm.DumpHistory(strm);
+        Host::SetCrashDescription (strm.GetData());
+        assert (!"Didn't get sequence mutex for write all registers.");
+#else
+        if (log)
         {
-            if (1 /*log->GetVerbose() */)
+            if (log->GetVerbose())
             {
                 StreamString strm;
                 gdb_comm.DumpHistory(strm);
-                Host::SetCrashDescription (strm.GetData());
-                assert (!"Didn't get sequence mutex.");
                 log->Printf("error: failed to get packet sequence mutex, not sending write all registers:\n%s", strm.GetData());
             }
             else
                 log->Printf("error: failed to get packet sequence mutex, not sending write all registers");
         }
+#endif
     }
     return false;
 }