Remove the top-level DebugDriverThread in ProcessWindows.

Originally the idea was that we would queue requests to a master
thread that would dispatch them to other slave threads each
responsible for debugging an individual process.  This might make
some scenarios more scalable and responsive, but for now it seems
to be unwarranted complexity for no observable benefit.

llvm-svn: 221561

1 files changed, 3 insertions, 9 deletions

diff --git a/lldb/source/Plugins/Process/Windows/ProcessWindows.cpp b/lldb/source/Plugins/Process/Windows/ProcessWindows.cpp
index be302bdc7cf..f0edeaeeaaa 100644
--- a/lldb/source/Plugins/Process/Windows/ProcessWindows.cpp
+++ b/lldb/source/Plugins/Process/Windows/ProcessWindows.cpp
@@ -27,8 +27,7 @@
 #include "lldb/Target/FileAction.h"
 #include "lldb/Target/Target.h"
 
-#include "DebugDriverThread.h"
-#include "DebugProcessLauncher.h"
+#include "DebuggerThread.h"
 #include "LocalDebugDelegate.h"
 #include "ProcessMessages.h"
 #include "ProcessWindows.h"
@@ -56,7 +55,6 @@ ProcessWindows::Initialize()
         PluginManager::RegisterPlugin(GetPluginNameStatic(),
                                       GetPluginDescriptionStatic(),
                                       CreateInstance);
-        DebugDriverThread::Initialize();
     }
 }
 
@@ -75,7 +73,6 @@ ProcessWindows::~ProcessWindows()
 void
 ProcessWindows::Terminate()
 {
-    DebugDriverThread::Teardown();
 }
 
 lldb_private::ConstString
@@ -108,12 +105,9 @@ ProcessWindows::DoLaunch(Module *exe_module,
     SetPrivateState(eStateLaunching);
     if (launch_info.GetFlags().Test(eLaunchFlagDebug))
     {
-        // If we're trying to debug this process, we need to use a
-        // DebugProcessLauncher so that we can enter a WaitForDebugEvent loop
-        // on the same thread that does the CreateProcess.
         DebugDelegateSP delegate(new LocalDebugDelegate(shared_from_this()));
-        DebugProcessLauncher launcher(delegate);
-        process = launcher.LaunchProcess(launch_info, result);
+        m_debugger.reset(new DebuggerThread(delegate));
+        process = m_debugger->DebugLaunch(launch_info);
     }
     else
         return Host::LaunchProcess(launch_info);