commit e13c2731ba83ce3f820026878240f72d3b7df0d5
author Tamas Berghammer <tberghammer@google.com> Wed Feb 11 10:29:30 2015 +0000
committer Tamas Berghammer <tberghammer@google.com> Wed Feb 11 10:29:30 2015 +0000
tree ea061498b66cd4219dd18fc5aedb167548b70e90
parent c4d5ed06cde28a4c209385a2513e338673834c80

Separate monolithic GDBRemoteCommunicationServer class into 4 part

GDBRemoteCommunicationServer: Basic packet handling, handler registration
LLDBCommonPacketHandler: Common packet handling for lldb-platform and lldb-gdbserver
LLDBPlatformPacketHandler: lldb-platform specific packet handling
LLGSPacketHandler: lldb-gdbserver specific packet handling

Differential Revision: http://reviews.llvm.org/D7538

llvm-svn: 228823

lldb/tools/lldb-platform/lldb-platform.cpp

diff --git a/lldb/tools/lldb-platform/lldb-platform.cpp b/lldb/tools/lldb-platform/lldb-platform.cpp
index f1c1a98..a23500a 100644
--- a/lldb/tools/lldb-platform/lldb-platform.cpp
+++ b/lldb/tools/lldb-platform/lldb-platform.cpp
@@ -33,8 +33,9 @@
 #include "lldb/Host/OptionParser.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
-#include "Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h"
+#include "Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.h"
 #include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h"
+
 using namespace lldb;
 using namespace lldb_private;
 
@@ -115,7 +116,7 @@
     debugger_sp->SetOutputFileHandle(stdout, false);
     debugger_sp->SetErrorFileHandle(stderr, false);
     
-    GDBRemoteCommunicationServer::PortMap gdbserver_portmap;
+    GDBRemoteCommunicationServerPlatform::PortMap gdbserver_portmap;
     int min_gdbserver_port = 0;
     int max_gdbserver_port = 0;
     uint16_t port_offset = 0;
@@ -246,14 +247,14 @@
 
 
     do {
-        GDBRemoteCommunicationServer gdb_server (true);
+        GDBRemoteCommunicationServerPlatform platform;
         
         if (port_offset > 0)
-            gdb_server.SetPortOffset(port_offset);
+            platform.SetPortOffset(port_offset);
 
         if (!gdbserver_portmap.empty())
         {
-            gdb_server.SetPortMap(std::move(gdbserver_portmap));
+            platform.SetPortMap(std::move(gdbserver_portmap));
         }
 
         if (!listen_host_port.empty())
@@ -268,7 +269,7 @@
                 if (conn_ap->Connect(connect_url.c_str(), &error) == eConnectionStatusSuccess)
                 {
                     printf ("Connection established.\n");
-                    gdb_server.SetConnection (conn_ap.release());
+                    platform.SetConnection (conn_ap.release());
                 }
                 else
                 {
@@ -276,16 +277,16 @@
                 }
             }
 
-            if (gdb_server.IsConnected())
+            if (platform.IsConnected())
             {
                 // After we connected, we need to get an initial ack from...
-                if (gdb_server.HandshakeWithClient(&error))
+                if (platform.HandshakeWithClient(&error))
                 {
                     bool interrupt = false;
                     bool done = false;
                     while (!interrupt && !done)
                     {
-                        if (gdb_server.GetPacketAndSendResponse (UINT32_MAX, error, interrupt, done) != GDBRemoteCommunication::PacketResult::Success)
+                        if (platform.GetPacketAndSendResponse (UINT32_MAX, error, interrupt, done) != GDBRemoteCommunication::PacketResult::Success)
                             break;
                     }