Customized using SystemInitializer.

Author: slydiman

lldb/include/lldb/Initialization/SystemInitializer.h

@@ -9,6 +9,7 @@
 #ifndef LLDB_INITIALIZATION_SYSTEMINITIALIZER_H
 #define LLDB_INITIALIZATION_SYSTEMINITIALIZER_H
 
+#include "lldb/lldb-private-types.h"
 #include "llvm/Support/Error.h"
 
 #include <string>
@@ -20,7 +21,7 @@ class SystemInitializer {
   SystemInitializer();
   virtual ~SystemInitializer();
 
-  virtual llvm::Error Initialize() = 0;
+  virtual llvm::Error Initialize(LoadPluginCallbackType plugin_callback) = 0;
   virtual void Terminate() = 0;
 };
 }

lldb/include/lldb/Initialization/SystemInitializerCommon.h

@@ -26,7 +26,7 @@ class SystemInitializerCommon : public SystemInitializer {
   SystemInitializerCommon(HostInfo::SharedLibraryDirectoryHelper *helper);
   ~SystemInitializerCommon() override;
 
-  llvm::Error Initialize() override;
+  llvm::Error Initialize(LoadPluginCallbackType plugin_callback) override;
   void Terminate() override;
 
 private:

lldb/include/lldb/Initialization/SystemLifetimeManager.h

@@ -21,7 +21,7 @@ namespace lldb_private {
 class SystemLifetimeManager {
 public:
   SystemLifetimeManager();
-  virtual ~SystemLifetimeManager();
+  ~SystemLifetimeManager();
 
   llvm::Error Initialize(std::unique_ptr<SystemInitializer> initializer,
                          LoadPluginCallbackType plugin_callback);
@@ -32,9 +32,6 @@ class SystemLifetimeManager {
   std::unique_ptr<SystemInitializer> m_initializer;
   bool m_initialized = false;
 
-  virtual void InitializeDebugger(LoadPluginCallbackType plugin_callback) {};
-  virtual void TerminateDebugger() {};
-
   // Noncopyable.
   SystemLifetimeManager(const SystemLifetimeManager &other) = delete;
   SystemLifetimeManager &operator=(const SystemLifetimeManager &other) = delete;

lldb/include/lldb/Initialization/SystemLifetimeManagerDbg.h

@@ -44,7 +44,7 @@
 #include "lldb/Host/Config.h"
 #include "lldb/Host/StreamFile.h"
 #include "lldb/Host/XML.h"
-#include "lldb/Initialization/SystemLifetimeManagerDbg.h"
+#include "lldb/Initialization/SystemLifetimeManager.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/OptionArgParser.h"
 #include "lldb/Interpreter/OptionGroupPlatform.h"
@@ -66,7 +66,7 @@
 using namespace lldb;
 using namespace lldb_private;
 
-static llvm::ManagedStatic<SystemLifetimeManagerDbg> g_debugger_lifetime;
+static llvm::ManagedStatic<SystemLifetimeManager> g_debugger_lifetime;
 
 SBError SBInputReader::Initialize(
     lldb::SBDebugger &sb_debugger,

lldb/source/API/SBDebugger.cpp

@@ -49,8 +49,9 @@ SystemInitializerFull::SystemInitializerFull()
     : SystemInitializerCommon(g_shlib_dir_helper) {}
 SystemInitializerFull::~SystemInitializerFull() = default;
 
-llvm::Error SystemInitializerFull::Initialize() {
-  llvm::Error error = SystemInitializerCommon::Initialize();
+llvm::Error
+SystemInitializerFull::Initialize(LoadPluginCallbackType plugin_callback) {
+  llvm::Error error = SystemInitializerCommon::Initialize(plugin_callback);
   if (error)
     return error;
 
@@ -86,10 +87,14 @@ llvm::Error SystemInitializerFull::Initialize() {
 
   LLDB_LOG(GetLog(SystemLog::System), "{0}", GetVersion());
 
+  Debugger::Initialize(plugin_callback);
+
   return llvm::Error::success();
 }
 
 void SystemInitializerFull::Terminate() {
+  Debugger::Terminate();
+
   Debugger::SettingsTerminate();
 
   // Terminate plug-ins in core LLDB.

lldb/source/API/SystemInitializerFull.cpp

@@ -23,7 +23,7 @@ class SystemInitializerFull : public SystemInitializerCommon {
   SystemInitializerFull();
   ~SystemInitializerFull() override;
 
-  llvm::Error Initialize() override;
+  llvm::Error Initialize(LoadPluginCallbackType plugin_callback) override;
   void Terminate() override;
 };
 

lldb/source/API/SystemInitializerFull.h

@@ -41,7 +41,8 @@ SystemInitializerCommon::SystemInitializerCommon(
 
 SystemInitializerCommon::~SystemInitializerCommon() = default;
 
-llvm::Error SystemInitializerCommon::Initialize() {
+llvm::Error
+SystemInitializerCommon::Initialize(LoadPluginCallbackType plugin_callback) {
 #if defined(_WIN32)
   const char *disable_crash_dialog_var = getenv("LLDB_DISABLE_CRASH_DIALOG");
   if (disable_crash_dialog_var &&

lldb/source/Initialization/SystemInitializerCommon.cpp

@@ -32,10 +32,8 @@ llvm::Error SystemLifetimeManager::Initialize(
     m_initialized = true;
     m_initializer = std::move(initializer);
 
-    if (auto e = m_initializer->Initialize())
+    if (auto e = m_initializer->Initialize(plugin_callback))
       return e;
-
-    InitializeDebugger(plugin_callback);
   }
 
   return llvm::Error::success();
@@ -45,7 +43,6 @@ void SystemLifetimeManager::Terminate() {
   std::lock_guard<std::recursive_mutex> guard(m_mutex);
 
   if (m_initialized) {
-    TerminateDebugger();
     m_initializer->Terminate();
 
     m_initializer.reset();

lldb/source/Initialization/SystemLifetimeManager.cpp

@@ -56,8 +56,9 @@ using HostObjectFile = ObjectFileELF;
 
 using namespace lldb_private;
 
-llvm::Error SystemInitializerLLGS::Initialize() {
-  if (auto e = SystemInitializerCommon::Initialize())
+llvm::Error
+SystemInitializerLLGS::Initialize(LoadPluginCallbackType plugin_callback) {
+  if (auto e = SystemInitializerCommon::Initialize(plugin_callback))
     return e;
 
   HostObjectFile::Initialize();

lldb/tools/lldb-server/SystemInitializerLLGS.cpp

@@ -16,7 +16,8 @@ class SystemInitializerLLGS : public lldb_private::SystemInitializerCommon {
 public:
   SystemInitializerLLGS() : SystemInitializerCommon(nullptr) {}
 
-  llvm::Error Initialize() override;
+  llvm::Error
+  Initialize(lldb_private::LoadPluginCallbackType plugin_callback) override;
   void Terminate() override;
 };
 

lldb/tools/lldb-server/SystemInitializerLLGS.h

@@ -26,8 +26,9 @@ SystemInitializerTest::SystemInitializerTest()
     : SystemInitializerCommon(nullptr) {}
 SystemInitializerTest::~SystemInitializerTest() = default;
 
-llvm::Error SystemInitializerTest::Initialize() {
-  if (auto e = SystemInitializerCommon::Initialize())
+llvm::Error
+SystemInitializerTest::Initialize(LoadPluginCallbackType plugin_callback) {
+  if (auto e = SystemInitializerCommon::Initialize(plugin_callback))
     return e;
 
   // Initialize LLVM and Clang
@@ -51,10 +52,14 @@ llvm::Error SystemInitializerTest::Initialize() {
   // Settings must be initialized AFTER PluginManager::Initialize is called.
   Debugger::SettingsInitialize();
 
+  Debugger::Initialize(plugin_callback);
+
   return llvm::Error::success();
 }
 
 void SystemInitializerTest::Terminate() {
+  Debugger::Terminate();
+
   Debugger::SettingsTerminate();
 
   // Terminate and unload and loaded system or user LLDB plug-ins

lldb/tools/lldb-test/SystemInitializerTest.cpp

@@ -23,7 +23,7 @@ class SystemInitializerTest : public SystemInitializerCommon {
   SystemInitializerTest();
   ~SystemInitializerTest() override;
 
-  llvm::Error Initialize() override;
+  llvm::Error Initialize(LoadPluginCallbackType plugin_callback) override;
   void Terminate() override;
 };
 

lldb/tools/lldb-test/SystemInitializerTest.h

@@ -17,7 +17,7 @@
 #include "lldb/Core/Module.h"
 #include "lldb/Core/Section.h"
 #include "lldb/Expression/IRMemoryMap.h"
-#include "lldb/Initialization/SystemLifetimeManagerDbg.h"
+#include "lldb/Initialization/SystemLifetimeManager.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
 #include "lldb/Symbol/CompileUnit.h"
@@ -1245,7 +1245,7 @@ int main(int argc, const char *argv[]) {
 
   cl::ParseCommandLineOptions(argc, argv, "LLDB Testing Utility\n");
 
-  SystemLifetimeManagerDbg DebuggerLifetime;
+  SystemLifetimeManager DebuggerLifetime;
   if (auto e = DebuggerLifetime.Initialize(
           std::make_unique<SystemInitializerTest>(), nullptr)) {
     WithColor::error() << "initialization failed: " << toString(std::move(e))