From 3f875c589fb6b581429d422b4257e7eb325bcbb2 Mon Sep 17 00:00:00 2001 From: Greg Clayton Date: Fri, 22 Feb 2013 22:23:55 +0000 Subject: [PATCH] Fixed an issue where if we got a 'A' async packet back from debugserver, we would resend the last continue command. We now correctly identify the packet as async (just like the 'O' stdout async packet) and we don't resend the continue command. llvm-svn: 175924 --- .../Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp index 1de76a4..80fa316 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp @@ -540,11 +540,11 @@ GDBRemoteCommunicationClient::SendContinuePacketAndWaitForResponse // may change if we are interrupted and we continue after an async packet... std::string continue_packet(payload, packet_length); - bool got_stdout = false; + bool got_async_packet = false; while (state == eStateRunning) { - if (!got_stdout) + if (!got_async_packet) { if (log) log->Printf ("GDBRemoteCommunicationClient::%s () sending continue packet: %s", __FUNCTION__, continue_packet.c_str()); @@ -554,7 +554,7 @@ GDBRemoteCommunicationClient::SendContinuePacketAndWaitForResponse m_private_is_running.SetValue (true, eBroadcastAlways); } - got_stdout = false; + got_async_packet = false; if (log) log->Printf ("GDBRemoteCommunicationClient::%s () WaitForPacket(%s)", __FUNCTION__, continue_packet.c_str()); @@ -737,7 +737,7 @@ GDBRemoteCommunicationClient::SendContinuePacketAndWaitForResponse case 'O': // STDOUT { - got_stdout = true; + got_async_packet = true; std::string inferior_stdout; inferior_stdout.reserve(response.GetBytesLeft () / 2); char ch; @@ -750,6 +750,7 @@ GDBRemoteCommunicationClient::SendContinuePacketAndWaitForResponse case 'A': // Async miscellaneous reply. Right now, only profile data is coming through this channel. { + got_async_packet = true; std::string input = response.GetStringRef().substr(1); // '1' to move beyond 'A' if (m_partial_profile_data.length() > 0) { -- 2.7.4