Move full initialization to lldb/API

[zturner]

Summary

This patch builds on top of D8428. The idea behind this change is to separate full initialization and LLGS initialization more strongly. Because InitializeForLLGS is in the same source file (or even the same library) as Initialize(), the linker has to deal with all these extra symbols, increasing binary size. In theory it can do dead code elimination, but it doesn't always do an optimal job (as the numbers later on show). Furthermore, there is some duplicated logic with regards to checking the ref count, and making sure Debugger::Initialize() and Debugger::Terminate is called in the correct order.

This patch addresses all of these issues by introducing a class called SystemLifetimeManager which *only* deals with the interaction between the ref count, calling Debugger::Initialize / Terminate, and actually shutting down the complete set of system services. In particular, it does *not* deal with the implementation details of what system services to initialize and shutdown.

This is accomplished by introducing an abstract base class called SystemInitializer with Initialize() and Terminate() methods. A standard implementation called SystemInitializerCommon is provided in the Initialization library. The functionality contained in here is identical to the functionality which used to be in InitializeForLLGS() and TerminateLLGS().

The full initialization implemetantion is now compiled directly into source/API via source/API/SystemInitializerFull.cpp, which provides an implementation built on top of SystemInitializerCommon (this is equivalent to the functionality that used to be in lldb_private::Initialize() / lldb_private::Terminate()

This all seems rather complicated, but using this approach the binary size of llgs is reduced quite a bit. Here are some numbers:

Before Patch:

Debug 738,065,786 bytes
Release 27,333,622 bytes
MinSizeRel 21,818,230 bytes
MinSizeRel with stripped symbols 16,364,008 bytes

After Patch:

Debug 475,575,879 bytes
Release 24,120,433 bytes
MinSizeRel 19,034,215 bytes
MinSizeRel with stripped symbols 14,395,872 bytes

So I'm seeing an improvement of about 12% for a fully minimized binary.

Note I haven't updated the Xcode project yet. I will do that now, but I wanted to put this up first for the high level idea.

[zturner]

My mistake. The patch builds on top of D8428, not the one I typed previously.

[zturner]

Update the Xcode project, this should build cleanly on OSX now when applied on top of the first patch.

[clayborg]

See inlined changes.

source/API/SBDebugger.cpp

104

Please put this in a static function and call the singleton and have it return a reference. The Apple build system prohibits frameworks from having global initializers.

So make this:

static SBDebuggerLifetimeManager &
GetDebuggerLifetimeManager ()
{
    static llvm::ManagedStatic<SBDebuggerLifetimeManager> g_debugger_lifetime;
    return g_debugger_lifetime;
}

142

Change this to:

GetDebuggerLifetimeManager ().AddRef();

148

Change this to:

GetDebuggerLifetimeManager (). Release();

tools/lldb-server/lldb-server.cpp

35

NOTE: this static is OK because this is in an application, not in a shared library or framework and Apple builds are ok with this.

[zturner]

In D8462#143777, @clayborg wrote:

See inlined changes.

I'll change it, but out of curiosity, I built it in Xcode and didn't see any issues. How would I need to build it to see the failure? ManagedStatic<> has a trivial constructor, is the Apple build system ok with it in that case?

[clayborg]

Try making a small C++ class and then making a global. You should see a warning for this global object. If this doesn't happen with your managed static, then we are ok and no changes are required. Just make sure you see the warning I am talking about with a C++ class that maybe inits a std:string with something.

[zturner]

I checked and I saw the warning with a different class but not with ManagedStatic<>. Since ManagedStatic<> is POD it only relies on the linker for initialization, so it looks like it doesn't have this issue. I think we don't have to worry about that changing in the future either. A comment in ManagedStaticBase.h says this:

// This should only be used as a static variable, which guarantees that this
// will be zero initialized.

So relying on the linker for initialization is part of the guarantee of the class, so it should never get a global constructor in the future either. Seems like we're ok then?

[zturner]

In D8462#143869, @zturner wrote:

I checked and I saw the warning with a different class but not with ManagedStatic<>. Since ManagedStatic<> is POD it only relies on the linker for initialization, so it looks like it doesn't have this issue. I think we don't have to worry about that changing in the future either. A comment in ManagedStaticBase.h says this:

// This should only be used as a static variable, which guarantees that this
// will be zero initialized.

So relying on the linker for initialization is part of the guarantee of the class, so it should never get a global constructor in the future either. Seems like we're ok then?

Just to be certain I saw the same warning you're talking about, I believe it said something like "Declaration requires a global destructor"

[clayborg]

Yes the warning is "Declaration requires a global destructor".

[zturner]

Ok, seems like we're good on that front then. Any thoughts on the rest of the CL? Incidentally it seems like g_debugger_shared_refcount is no longer needed after this CL, but it was too risky for this CL, so I thought I would try to do that later.

[clayborg]

Looks good.

[ovyalov]

source/API/SystemInitializerFull.cpp

1

Could we keep all initializers within source/Initialization folder?

source/Initialization/SystemLifetimeManager.cpp

68

s/shared_ptr/unique_ptr

[zturner]

Actually the entire point of the CL is to move the full initializer. By
keeping it in the same place the linker has to include all those extra
symbols. It can do dead code elimination, but it's not 100% foolproof. The
reason this CL reduces LLGS binary size from 16M to 14M is precisely
because full initializer is moved out

[tberghammer]

In D8462#143902, @zturner wrote:

Incidentally it seems like g_debugger_shared_refcount is no longer needed after this CL, but it was too risky for this CL, so I thought I would try to do that later.

I think it is still required by source/Interpreter/ScriptInterpreterPython.cpp. I would be happy if we can remove the magic (hack?) using it there but it looks far from trivial to do it.

[vharron]

Can we hold this CL until we have buildbots testing remote Linux? Maybe a
couple of weeks?

[vharron]

Thanks for this CL BTW

[tberghammer]

I think this CL won't effect remote Linux in any different way then local Linux so I don't see any reason why should we hold it back. We do several other change every week what can have major effect on remote Linux without having a build bot and we haven't seen too much issue because of it. Also holding back this CL for several weeks can cause merge conflicts where I think the chance to make a mistake when resolving them would be higher then the risk of this change. I also think that this is just 1 step from a longer process of cleaning up the dependencies in lldb. Blocking that process for a longer time seems like a very bad idea for me.

[zturner]

What Tamas said. I can hold it if there's a good reason, but I don't think
there's much risk involved here. The actual initialization / shutdown code
is a straight copy/paste from what it was before. So the question is just
if it's calling the initialization and shutdown code correctly. And the
local linux test suite would catch that if it were an issue.

[vharron]

One of these lldb-server optimization changes did break remote linux and I had to diagnose it. Tamas, can you test for Zach before committing?

[tberghammer]

@zturner: Please give me a ping when you sorted out the "ScriptInterpreterPython initialization" issue so I can try out your patch on remote Linux just to make sure.

[zturner]

Ok, i will try to get to it today, i got sidetracked on a few other issues

[zturner]

So the way I had to fix this was to change the semantics of Initialization and Termination slightly. I wanted to hold off on doing this until after this went in, but it seems there's no way to get around doing it now.

Basically, the original problem was this:

When running lldb the executable, we call SBDebugger::Initialize() and SBDebugger::Terminate(). Later, when ScriptInterpreterPython is initialized, it does an "import lldb", which implicitly calls SBDebugger::Initialize() *again*, which increments the refcount again. But there's only ever that one call to SBDebugger::Terminate -- the one we write explicitly. To account for this we had this hack where we decremented the refcount after the import statement if the import increased the refcount.

What this hack was really doing was saying "if we are running inside of lldb.exe, decrement the refcount after this import statement, so that at the end of the program, SBDebugger::Terminate() actually causes a clean shutdown. If we are running inside of python, leave the refcount alone, because there's only a single SBDebugger::Initialize() anyway -- the one that implicitly happens when you import -- so the atexit SBDebugger::Terminate will work".

To fix this in what I believe is the "correct" way, we simply kill the notion of a refcount entirely. It's either initialized or it's not. You can call Initialize() as many times as you want, and only the first call ever does anything. The rest of the calls just exit. And the first time you call Terminate() it really terminates.

This matches both the python usage pattern as well as the lldb.exe usage pattern. In the former, SBDebugger::Initialize() is called twice, but the second is a no-op, and the atexit handler to call SBDebugger::Terminate does the right thing. In the latter, there's only a single SBDebugger::Initialize and terminate, so everything works fine.

This also satisfies Greg's requirement that "import lldb" should be all you need to get up and running, since the SBDebugger.Initialize() is still there.

A side benefit of this change is that if someone accidentally calls SBDebugger.Initialize() from python, with this patch everything will still work. Prior to this patch, that would have raised the refcount to 2, and the single SBDebugger.Terminate() call we have in the atexit handler would only drop it to 1.

[zturner]

Fixed an error in my previous patch that would cause everything to fail. I wasn't setting m_initialized to true the first time around.

[tberghammer]

If you fix the namespace problem (see inline comment) than it looks good and don't cause any issue with remote Linux.

tools/lldb-server/lldb-server.cpp

20

SystemLifetimeManager is in lldb_private namespace. Please add namespace declaration as it isn't compile on Linux this way.

include/lldb/API/SystemInitializerFull.h

+//===-- SystemInitializerFull.h ---------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_API_SYSTEM_INITIALIZER_FULL_H
+#define LLDB_API_SYSTEM_INITIALIZER_FULL_H
+
+#include "lldb/Initialization/SystemInitializerCommon.h"
+
+namespace lldb_private
+{
+//------------------------------------------------------------------
+/// Initializes lldb.
+///
+/// This class is responsible for initializing all of lldb system
+/// services needed to use the full LLDB application.  This class is
+/// not intended to be used externally, but is instead used
+/// internally by SBDebugger to initialize the system.
+//------------------------------------------------------------------
+class SystemInitializerFull : public SystemInitializerCommon
+{
+  public:
+    SystemInitializerFull();
+    virtual ~SystemInitializerFull();
+
+    void Initialize() override;
+    void Terminate() override;
+};
+}
+
+#endif

include/lldb/Initialization/InitializeLLDB.h

-//===-- InitializeLLDB.h ----------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_INITIALIZATION_INITIALIZE_LLDB_H
-#define LLDB_INITIALIZATION_INITIALIZE_LLDB_H
-
-#include "lldb/lldb-private-types.h"
-
-namespace lldb_private
-{
-
-//------------------------------------------------------------------
-/// Initializes lldb.
-///
-/// This function should be called prior to using any lldb
-/// classes to ensure they have a chance to do any static
-/// initialization that they need to do.
-//------------------------------------------------------------------
-void Initialize(LoadPluginCallbackType load_plugin_callback);
-
-//------------------------------------------------------------------
-/// Initializes subset of lldb for LLGS.
-///
-/// This function only initializes the set of components and plugins
-/// necessary for lldb-platform and lldb-gdbserver, reducing the
-/// impact on the statically linked binary size.
-//------------------------------------------------------------------
-void InitializeForLLGS(LoadPluginCallbackType load_plugin_callback);
-
-//------------------------------------------------------------------
-/// Terminates lldb
-///
-/// This function optionally can be called when clients are done
-/// using lldb functionality to free up any static resources
-/// that have been allocated during initialization or during
-/// function calls. No lldb functions should be called after
-/// calling this function without again calling DCInitialize()
-/// again.
-//------------------------------------------------------------------
-void Terminate();
-
-//------------------------------------------------------------------
-/// Terminates subset of lldb initialized by InitializeForLLGS
-///
-/// This function optionally can be called when clients are done
-/// using lldb functionality to free up any static resources
-/// that have been allocated during initialization or during
-/// function calls. No lldb functions should be called after
-/// calling this function without again calling DCInitialize()
-/// again.
-//------------------------------------------------------------------
-void TerminateLLGS();
-}
-
-#endif

include/lldb/Initialization/SystemInitializer.h

+//===-- SystemInitializer.h -------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_INITIALIZATION_SYSTEM_INITIALIZER_H
+#define LLDB_INITIALIZATION_SYSTEM_INITIALIZER_H
+
+namespace lldb_private
+{
+class SystemInitializer
+{
+  public:
+    SystemInitializer();
+    virtual ~SystemInitializer();
+
+    virtual void Initialize() = 0;
+    virtual void Terminate() = 0;
+};
+}
+
+#endif

include/lldb/Initialization/SystemInitializerCommon.h

+//===-- SystemInitializerCommon.h -------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_INITIALIZATION_SYSTEM_INITIALIZER_COMMON_H
+#define LLDB_INITIALIZATION_SYSTEM_INITIALIZER_COMMON_H
+
+#include "SystemInitializer.h"
+
+namespace lldb_private
+{
+//------------------------------------------------------------------
+/// Initializes common lldb functionality.
+///
+/// This class is responsible for initializing a subset of lldb
+/// useful to both debug servers and debug clients.  Debug servers
+/// do not use all of LLDB and desire small binary sizes, so this
+/// functionality is separate.  This class is used by constructing
+/// an instance of SystemLifetimeManager with this class passed to
+/// the constructor.
+//------------------------------------------------------------------
+class SystemInitializerCommon : public SystemInitializer
+{
+  public:
+    SystemInitializerCommon();
+    virtual ~SystemInitializerCommon();
+
+    void Initialize() override;
+    void Terminate() override;
+};
+}
+
+#endif

include/lldb/Initialization/SystemLifetimeManager.h

+//===-- SystemLifetimeManager.h -------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_INITIALIZATION_SYSTEM_LIFETIME_MANAGER_H
+#define LLDB_INITIALIZATION_SYSTEM_LIFETIME_MANAGER_H
+
+#include "lldb/lldb-private-types.h"
+#include "lldb/Host/Mutex.h"
+
+#include <memory>
+
+namespace lldb_private
+{
+class SystemInitializer;
+
+class SystemLifetimeManager
+{
+  public:
+    SystemLifetimeManager(std::unique_ptr<SystemInitializer> initializer, LoadPluginCallbackType plugin_callback);
+    ~SystemLifetimeManager();
+
+    uint32_t AddRef();
+    uint32_t Release();
+
+  private:
+    Mutex m_mutex;
+    std::unique_ptr<SystemInitializer> m_initializer;
+    LoadPluginCallbackType m_plugin_callback;
+    uint32_t m_ref_count;
+
+    // Noncopyable.
+    SystemLifetimeManager(const SystemLifetimeManager &other) = delete;
+    SystemLifetimeManager &operator=(const SystemLifetimeManager &other) = delete;
+};
+}
+
+#endif

lldb.xcodeproj/project.pbxproj

     3F8160A61AB9F7DD001DA9DF /* Logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F8160A51AB9F7DD001DA9DF /* Logging.cpp */; };
     3F8169191ABA2419001DA9DF /* ConvertEnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F8169171ABA2419001DA9DF /* ConvertEnum.cpp */; };
     3F81691A1ABA2419001DA9DF /* NameMatches.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F8169181ABA2419001DA9DF /* NameMatches.cpp */; };
-    3F8169281ABB73D9001DA9DF /* InitializeLLDB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F8169271ABB73D9001DA9DF /* InitializeLLDB.cpp */; };
+    3F81692C1ABB7A1E001DA9DF /* SystemInitializerFull.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F81692A1ABB7A16001DA9DF /* SystemInitializerFull.cpp */; };
+    3F8169311ABB7A6D001DA9DF /* SystemInitializer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F81692E1ABB7A6D001DA9DF /* SystemInitializer.cpp */; };
+    3F8169321ABB7A6D001DA9DF /* SystemInitializerCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F81692F1ABB7A6D001DA9DF /* SystemInitializerCommon.cpp */; };
+    3F8169331ABB7A6D001DA9DF /* SystemLifetimeManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F8169301ABB7A6D001DA9DF /* SystemLifetimeManager.cpp */; };
     3FDFDDBD199C3A06009756A7 /* FileAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FDFDDBC199C3A06009756A7 /* FileAction.cpp */; };
     3FDFDDBF199D345E009756A7 /* FileCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FDFDDBE199D345E009756A7 /* FileCache.cpp */; };
     3FDFDDC6199D37ED009756A7 /* FileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FDFDDC5199D37ED009756A7 /* FileSystem.cpp */; };

     3F8169181ABA2419001DA9DF /* NameMatches.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NameMatches.cpp; path = source/Utility/NameMatches.cpp; sourceTree = "<group>"; };
     3F81691B1ABA242B001DA9DF /* ConvertEnum.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ConvertEnum.h; path = include/lldb/Utility/ConvertEnum.h; sourceTree = "<group>"; };
     3F81691C1ABA242B001DA9DF /* NameMatches.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = NameMatches.h; path = include/lldb/Utility/NameMatches.h; sourceTree = "<group>"; };
-    3F8169271ABB73D9001DA9DF /* InitializeLLDB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = InitializeLLDB.cpp; path = source/Initialization/InitializeLLDB.cpp; sourceTree = "<group>"; };
-    3F8169291ABB73E6001DA9DF /* InitializeLLDB.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = InitializeLLDB.h; path = include/lldb/Initialization/InitializeLLDB.h; sourceTree = "<group>"; };
+    3F81692A1ABB7A16001DA9DF /* SystemInitializerFull.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SystemInitializerFull.cpp; path = source/API/SystemInitializerFull.cpp; sourceTree = "<group>"; };
+    3F81692D1ABB7A40001DA9DF /* SystemInitializerFull.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SystemInitializerFull.h; path = include/lldb/API/SystemInitializerFull.h; sourceTree = "<group>"; };
+    3F81692E1ABB7A6D001DA9DF /* SystemInitializer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SystemInitializer.cpp; path = source/Initialization/SystemInitializer.cpp; sourceTree = "<group>"; };
+    3F81692F1ABB7A6D001DA9DF /* SystemInitializerCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SystemInitializerCommon.cpp; path = source/Initialization/SystemInitializerCommon.cpp; sourceTree = "<group>"; };
+    3F8169301ABB7A6D001DA9DF /* SystemLifetimeManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SystemLifetimeManager.cpp; path = source/Initialization/SystemLifetimeManager.cpp; sourceTree = "<group>"; };
+    3F8169341ABB7A80001DA9DF /* SystemInitializer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SystemInitializer.h; path = include/lldb/Initialization/SystemInitializer.h; sourceTree = "<group>"; };
+    3F8169351ABB7A80001DA9DF /* SystemInitializerCommon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SystemInitializerCommon.h; path = include/lldb/Initialization/SystemInitializerCommon.h; sourceTree = "<group>"; };
+    3F8169361ABB7A80001DA9DF /* SystemLifetimeManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SystemLifetimeManager.h; path = include/lldb/Initialization/SystemLifetimeManager.h; sourceTree = "<group>"; };
     3FDFD6C3199C396E009756A7 /* FileAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileAction.h; path = include/lldb/Target/FileAction.h; sourceTree = "<group>"; };
     3FDFDDBC199C3A06009756A7 /* FileAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileAction.cpp; path = source/Target/FileAction.cpp; sourceTree = "<group>"; };
     3FDFDDBE199D345E009756A7 /* FileCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileCache.cpp; path = source/Host/common/FileCache.cpp; sourceTree = "<group>"; };

         94235B9B1A8D5FF300EB2EED /* SBVariablesOptions.cpp */,
         B2A58721143119810092BFBA /* SBWatchpoint.h */,
         B2A58723143119D50092BFBA /* SBWatchpoint.cpp */,
+        3F81692D1ABB7A40001DA9DF /* SystemInitializerFull.h */,
+        3F81692A1ABB7A16001DA9DF /* SystemInitializerFull.cpp */,
       );
       name = API;
       sourceTree = "<group>";

     3F8169261ABB73C1001DA9DF /* Initialization */ = {
       isa = PBXGroup;
       children = (
-        3F8169291ABB73E6001DA9DF /* InitializeLLDB.h */,
-        3F8169271ABB73D9001DA9DF /* InitializeLLDB.cpp */,
+        3F8169341ABB7A80001DA9DF /* SystemInitializer.h */,
+        3F81692E1ABB7A6D001DA9DF /* SystemInitializer.cpp */,
+        3F8169351ABB7A80001DA9DF /* SystemInitializerCommon.h */,
+        3F81692F1ABB7A6D001DA9DF /* SystemInitializerCommon.cpp */,
+        3F8169361ABB7A80001DA9DF /* SystemLifetimeManager.h */,
+        3F8169301ABB7A6D001DA9DF /* SystemLifetimeManager.cpp */,
       );
       name = Initialization;
       sourceTree = "<group>";

         26680324116005D9008E1FE4 /* SBThread.cpp in Sources */,
         26680326116005DB008E1FE4 /* SBTarget.cpp in Sources */,
         26680327116005DC008E1FE4 /* SBSourceManager.cpp in Sources */,
+        3F81692C1ABB7A1E001DA9DF /* SystemInitializerFull.cpp in Sources */,
         26680328116005DE008E1FE4 /* SBProcess.cpp in Sources */,
         2668032A116005E0008E1FE4 /* SBListener.cpp in Sources */,
         2668032C116005E2008E1FE4 /* SBFrame.cpp in Sources */,

         2689002413353DDE00698AC0 /* CommandObjectSettings.cpp in Sources */,
         2689002513353DDE00698AC0 /* CommandObjectSource.cpp in Sources */,
         2689002613353DDE00698AC0 /* CommandObjectSyntax.cpp in Sources */,
+        3F8169331ABB7A6D001DA9DF /* SystemLifetimeManager.cpp in Sources */,
         4959511F1A1BC4BC00F6F8FC /* ClangModulesDeclVendor.cpp in Sources */,
         26BC179918C7F2B300D2196D /* JITLoader.cpp in Sources */,
         2689002713353DDE00698AC0 /* CommandObjectTarget.cpp in Sources */,

         8CCB017E19BA28A80009FD44 /* ThreadCollection.cpp in Sources */,
         2689005613353E0400698AC0 /* Value.cpp in Sources */,
         2689005713353E0400698AC0 /* ValueObject.cpp in Sources */,
+        3F8169321ABB7A6D001DA9DF /* SystemInitializerCommon.cpp in Sources */,
         2689005813353E0400698AC0 /* ValueObjectChild.cpp in Sources */,
         233B007F1960CB280090E598 /* ProcessLaunchInfo.cpp in Sources */,
         2689005913353E0400698AC0 /* ValueObjectConstResult.cpp in Sources */,

         268900B013353E5000698AC0 /* RegisterContextLLDB.cpp in Sources */,
         3FDFE56C19AF9C44009756A7 /* HostProcessPosix.cpp in Sources */,
         268900B413353E5000698AC0 /* RegisterContextMacOSXFrameBackchain.cpp in Sources */,
+        3F8169311ABB7A6D001DA9DF /* SystemInitializer.cpp in Sources */,
         3FDFED2D19C257A0009756A7 /* HostProcess.cpp in Sources */,
         268900B513353E5000698AC0 /* StopInfoMachException.cpp in Sources */,
         268900B613353E5000698AC0 /* UnwindMacOSXFrameBackchain.cpp in Sources */,

         94CB257216B0A4270059775D /* TypeSynthetic.cpp in Sources */,
         94CB257416B1D3880059775D /* FormatCache.cpp in Sources */,
         A36FF33C17D8E94600244D40 /* OptionParser.cpp in Sources */,
-        3F8169281ABB73D9001DA9DF /* InitializeLLDB.cpp in Sources */,
       );
       runOnlyForDeploymentPostprocessing = 0;
     };

source/API/CMakeLists.txt

   SBVariablesOptions.cpp
   SBWatchpoint.cpp
   SBUnixSignals.cpp
+  SystemInitializerFull.cpp
   ${LLDB_WRAP_PYTHON}
   ${LLDB_VERS_GENERATED_FILE}
   )

source/API/SBDebugger.cpp

 
 #include "lldb/lldb-private.h"
 
+#include "lldb/API/SystemInitializerFull.h"
 #include "lldb/API/SBListener.h"
 #include "lldb/API/SBBroadcaster.h"
 #include "lldb/API/SBCommandInterpreter.h"

 #include "lldb/Core/State.h"
 #include "lldb/Core/StreamFile.h"
 #include "lldb/DataFormatters/DataVisualization.h"
-#include "lldb/Initialization/InitializeLLDB.h"
+#include "lldb/Initialization/SystemLifetimeManager.h"
 #include "lldb/Interpreter/Args.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/OptionGroupPlatform.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/TargetList.h"
 
+#include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/DynamicLibrary.h"
 
 using namespace lldb;
 using namespace lldb_private;
 
 
-SBInputReader::SBInputReader()
-{
-}
-SBInputReader::~SBInputReader()
-{
-}
-
-SBError
-SBInputReader::Initialize(lldb::SBDebugger& sb_debugger, unsigned long (*)(void*, lldb::SBInputReader*, lldb::InputReaderAction, char const*, unsigned long), void*, lldb::InputReaderGranularity, char const*, char const*, bool)
-{
-    return SBError();
-}
-
-void
-SBInputReader::SetIsDone(bool)
-{
-}
-bool
-SBInputReader::IsActive() const
-{
-    return false;
-}
-
 static llvm::sys::DynamicLibrary
 LoadPlugin (const lldb::DebuggerSP &debugger_sp, const FileSpec& spec, Error& error)
 {

     return llvm::sys::DynamicLibrary();
 }
 
+namespace
+{
+// SBDebuggerLifetimeManager is just a shim around SystemLifetimeManager so that
+// we can have a default constructor that calls SystemLifetimeManager's
+// constructor with the right arguments (a requirement of llvm::ManagedStatic)
+class SBDebuggerLifetimeManager : public SystemLifetimeManager
+{
+  public:
+    SBDebuggerLifetimeManager()
+        : SystemLifetimeManager(llvm::make_unique<SystemInitializerFull>(), LoadPlugin)
+    {
+    }
+};
+}
+
+static llvm::ManagedStatic<SBDebuggerLifetimeManager> g_debugger_lifetime;
+
+SBInputReader::SBInputReader()
+{
+}
+SBInputReader::~SBInputReader()
+{
+}
+
+SBError
+SBInputReader::Initialize(lldb::SBDebugger &sb_debugger,
+                          unsigned long (*)(void *, lldb::SBInputReader *, lldb::InputReaderAction, char const *,
+                                            unsigned long),
+                          void *, lldb::InputReaderGranularity, char const *, char const *, bool)
+{
+    return SBError();
+}
+
+void
+SBInputReader::SetIsDone(bool)
+{
+}
+bool
+SBInputReader::IsActive() const
+{
+    return false;
+}
+
 void
 SBDebugger::Initialize ()
 {

 
     SBCommandInterpreter::InitializeSWIG ();
 
-    lldb_private::Initialize(LoadPlugin);
+    g_debugger_lifetime->AddRef();
 }
 
 void
 SBDebugger::Terminate ()
 {
-    lldb_private::Terminate();
+    g_debugger_lifetime->Release();
 }
 
 void

source/API/SystemInitializerFull.cpp

+//===-- SystemInitializerFull.cpp -------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/API/SystemInitializerFull.h"
+
+#include "lldb/Core/Debugger.h"
+#include "lldb/Core/Timer.h"
+#include "lldb/Host/Host.h"
+#include "lldb/Initialization/SystemInitializerCommon.h"
+
+#include "Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h"
+#include "Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h"
+#include "Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h"
+#include "Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h"
+#include "Plugins/ABI/SysV-ppc/ABISysV_ppc.h"
+#include "Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h"
+#include "Plugins/Disassembler/llvm/DisassemblerLLVMC.h"
+#include "Plugins/DynamicLoader/Static/DynamicLoaderStatic.h"
+#include "Plugins/Instruction/ARM/EmulateInstructionARM.h"
+#include "Plugins/Instruction/ARM64/EmulateInstructionARM64.h"
+#include "Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h"
+#include "Plugins/InstrumentationRuntime/AddressSanitizer/AddressSanitizerRuntime.h"
+#include "Plugins/JITLoader/GDB/JITLoaderGDB.h"
+#include "Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h"
+#include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h"
+#include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h"
+#include "Plugins/MemoryHistory/asan/MemoryHistoryASan.h"
+#include "Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h"
+#include "Plugins/Process/elf-core/ProcessElfCore.h"
+#include "Plugins/Process/gdb-remote/ProcessGDBRemote.h"
+#include "Plugins/SymbolFile/DWARF/SymbolFileDWARF.h"
+#include "Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h"
+#include "Plugins/SymbolFile/Symtab/SymbolFileSymtab.h"
+#include "Plugins/SymbolVendor/ELF/SymbolVendorELF.h"
+#include "Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.h"
+#include "Plugins/UnwindAssembly/x86/UnwindAssembly-x86.h"
+#include "Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h"
+
+#if defined(__APPLE__)
+#include "Plugins/Process/mach-core/ProcessMachCore.h"
+#include "Plugins/Process/MacOSX-Kernel/ProcessKDP.h"
+#include "Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.h"
+#endif
+
+#if defined(__FreeBSD__)
+#include "Plugins/Process/FreeBSD/ProcessFreeBSD.h"
+#endif
+
+#if defined(__linux__)
+#include "Plugins/Process/Linux/ProcessLinux.h"
+#endif
+
+#if defined(_MSC_VER)
+#include "lldb/Host/windows/windows.h"
+#include "Plugins/Process/Windows/DynamicLoaderWindows.h"
+#include "Plugins/Process/Windows/ProcessWindows.h"
+#endif
+
+#include "llvm/Support/TargetSelect.h"
+
+#include <string>
+
+using namespace lldb_private;
+
+SystemInitializerFull::SystemInitializerFull()
+{
+}
+
+SystemInitializerFull::~SystemInitializerFull()
+{
+}
+
+void
+SystemInitializerFull::Initialize()
+{
+    SystemInitializerCommon::Initialize();
+
+    // Initialize LLVM and Clang
+    llvm::InitializeAllTargets();
+    llvm::InitializeAllAsmPrinters();
+    llvm::InitializeAllTargetMCs();
+    llvm::InitializeAllDisassemblers();
+
+    ABIMacOSX_i386::Initialize();
+    ABIMacOSX_arm::Initialize();
+    ABIMacOSX_arm64::Initialize();
+    ABISysV_x86_64::Initialize();
+    ABISysV_ppc::Initialize();
+    ABISysV_ppc64::Initialize();
+    DisassemblerLLVMC::Initialize();
+
+    JITLoaderGDB::Initialize();
+    ProcessElfCore::Initialize();
+    MemoryHistoryASan::Initialize();
+    AddressSanitizerRuntime::Initialize();
+
+    SymbolVendorELF::Initialize();
+    SymbolFileDWARF::Initialize();
+    SymbolFileSymtab::Initialize();
+    UnwindAssemblyInstEmulation::Initialize();
+    UnwindAssembly_x86::Initialize();
+    EmulateInstructionARM::Initialize();
+    EmulateInstructionARM64::Initialize();
+    EmulateInstructionMIPS64::Initialize();
+    SymbolFileDWARFDebugMap::Initialize();
+    ItaniumABILanguageRuntime::Initialize();
+    AppleObjCRuntimeV2::Initialize();
+    AppleObjCRuntimeV1::Initialize();
+    SystemRuntimeMacOSX::Initialize();
+
+#if defined(__linux__)
+    //----------------------------------------------------------------------
+    // Linux hosted plugins
+    //----------------------------------------------------------------------
+    ProcessLinux::Initialize();
+#endif
+#if defined(_MSC_VER)
+    DynamicLoaderWindows::Initialize();
+    ProcessWindows::Initialize();
+#endif
+#if defined(__FreeBSD__)
+    ProcessFreeBSD::Initialize();
+#endif
+#if defined(__APPLE__)
+    SymbolVendorMacOSX::Initialize();
+    ProcessKDP::Initialize();
+    ProcessMachCore::Initialize();
+#endif
+    //----------------------------------------------------------------------
+    // Platform agnostic plugins
+    //----------------------------------------------------------------------
+    PlatformRemoteGDBServer::Initialize();
+
+    ProcessGDBRemote::Initialize();
+    DynamicLoaderStatic::Initialize();
+
+    // Scan for any system or user LLDB plug-ins
+    PluginManager::Initialize();
+
+    // The process settings need to know about installed plug-ins, so the Settings must be initialized
+    // AFTER PluginManager::Initialize is called.
+
+    Debugger::SettingsInitialize();
+}
+
+void
+SystemInitializerFull::Terminate()
+{
+    Timer scoped_timer(__PRETTY_FUNCTION__, __PRETTY_FUNCTION__);
+    // Terminate and unload and loaded system or user LLDB plug-ins
+    PluginManager::Terminate();
+    ABIMacOSX_i386::Terminate();
+    ABIMacOSX_arm::Terminate();
+    ABIMacOSX_arm64::Terminate();
+    ABISysV_x86_64::Terminate();
+    ABISysV_ppc::Terminate();
+    ABISysV_ppc64::Terminate();
+    DisassemblerLLVMC::Terminate();
+
+    JITLoaderGDB::Terminate();
+    ProcessElfCore::Terminate();
+    MemoryHistoryASan::Terminate();
+    AddressSanitizerRuntime::Terminate();
+    SymbolVendorELF::Terminate();
+    SymbolFileDWARF::Terminate();
+    SymbolFileSymtab::Terminate();
+    UnwindAssembly_x86::Terminate();
+    UnwindAssemblyInstEmulation::Terminate();
+    EmulateInstructionARM::Terminate();
+    EmulateInstructionARM64::Terminate();
+    EmulateInstructionMIPS64::Terminate();
+    SymbolFileDWARFDebugMap::Terminate();
+    ItaniumABILanguageRuntime::Terminate();
+    AppleObjCRuntimeV2::Terminate();
+    AppleObjCRuntimeV1::Terminate();
+    SystemRuntimeMacOSX::Terminate();
+
+#if defined(__APPLE__)
+    ProcessMachCore::Terminate();
+    ProcessKDP::Terminate();
+    SymbolVendorMacOSX::Terminate();
+#endif
+#if defined(_MSC_VER)
+    DynamicLoaderWindows::Terminate();
+#endif
+
+#if defined(__linux__)
+    ProcessLinux::Terminate();
+#endif
+
+#if defined(__FreeBSD__)
+    ProcessFreeBSD::Terminate();
+#endif
+    Debugger::SettingsTerminate();
+
+    PlatformRemoteGDBServer::Terminate();
+    ProcessGDBRemote::Terminate();
+    DynamicLoaderStatic::Terminate();
+
+    // Now shutdown the common parts, in reverse order.
+    SystemInitializerCommon::Terminate();
+}

source/Core/Debugger.cpp

 #include "lldb/Host/HostInfo.h"
 #include "lldb/Host/Terminal.h"
 #include "lldb/Host/ThreadLauncher.h"
-#include "lldb/Initialization/InitializeLLDB.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/OptionValueProperties.h"
 #include "lldb/Interpreter/OptionValueSInt64.h"

source/Initialization/CMakeLists.txt

 add_lldb_library(lldbInitialization
-  InitializeLLDB.cpp
+  SystemInitializerCommon.cpp
+  SystemInitializer.cpp
+  SystemLifetimeManager.cpp
   )

source/Initialization/InitializeLLDB.cpp

-//===-- InitializeLLDB.cpp --------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lldb/Core/Debugger.h"
-#include "lldb/Core/Log.h"
-#include "lldb/Core/Timer.h"
-#include "lldb/Host/Host.h"
-#include "lldb/Host/HostInfo.h"
-#include "lldb/Host/Mutex.h"
-#include "lldb/Initialization/InitializeLLDB.h"
-#include "lldb/Interpreter/ScriptInterpreterPython.h"
-
-#include "Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h"
-#include "Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h"
-#include "Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h"
-#include "Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h"
-#include "Plugins/ABI/SysV-ppc/ABISysV_ppc.h"
-#include "Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h"
-#include "Plugins/Disassembler/llvm/DisassemblerLLVMC.h"
-#include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h"
-#include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h"
-#include "Plugins/DynamicLoader/Static/DynamicLoaderStatic.h"
-#include "Plugins/Instruction/ARM/EmulateInstructionARM.h"
-#include "Plugins/Instruction/ARM64/EmulateInstructionARM64.h"
-#include "Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h"
-#include "Plugins/InstrumentationRuntime/AddressSanitizer/AddressSanitizerRuntime.h"
-#include "Plugins/JITLoader/GDB/JITLoaderGDB.h"
-#include "Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h"
-#include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h"
-#include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h"
-#include "Plugins/MemoryHistory/asan/MemoryHistoryASan.h"
-#include "Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h"
-#include "Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h"
-#include "Plugins/ObjectFile/ELF/ObjectFileELF.h"
-#include "Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h"
-#include "Plugins/OperatingSystem/Python/OperatingSystemPython.h"
-#include "Plugins/Platform/Android/PlatformAndroid.h"
-#include "Plugins/Platform/FreeBSD/PlatformFreeBSD.h"
-#include "Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h"
-#include "Plugins/Platform/Kalimba/PlatformKalimba.h"
-#include "Plugins/Platform/Linux/PlatformLinux.h"
-#include "Plugins/Platform/MacOSX/PlatformiOSSimulator.h"
-#include "Plugins/Platform/MacOSX/PlatformMacOSX.h"
-#include "Plugins/Platform/MacOSX/PlatformRemoteiOS.h"
-#include "Plugins/Platform/Windows/PlatformWindows.h"
-#include "Plugins/Process/elf-core/ProcessElfCore.h"
-#include "Plugins/Process/gdb-remote/ProcessGDBRemote.h"
-#include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h"
-#include "Plugins/SymbolFile/DWARF/SymbolFileDWARF.h"
-#include "Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h"
-#include "Plugins/SymbolFile/Symtab/SymbolFileSymtab.h"
-#include "Plugins/SymbolVendor/ELF/SymbolVendorELF.h"
-#include "Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.h"
-#include "Plugins/UnwindAssembly/x86/UnwindAssembly-x86.h"
-#include "Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h"
-
-#if defined(__APPLE__)
-#include "Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h"
-#include "Plugins/ObjectFile/Mach-O/ObjectFileMachO.h"
-#include "Plugins/Platform/MacOSX/PlatformDarwinKernel.h"
-#include "Plugins/Process/mach-core/ProcessMachCore.h"
-#include "Plugins/Process/MacOSX-Kernel/ProcessKDP.h"
-#include "Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.h"
-#endif
-
-#if defined(__FreeBSD__)
-#include "Plugins/Process/FreeBSD/ProcessFreeBSD.h"
-#endif
-
-#if defined(__linux__)
-#include "Plugins/Process/Linux/ProcessLinux.h"
-#include "Plugins/Process/POSIX/ProcessPOSIXLog.h"
-#endif
-
-#if defined(_MSC_VER)
-#include "lldb/Host/windows/windows.h"
-#include "Plugins/Process/Windows/DynamicLoaderWindows.h"
-#include "Plugins/Process/Windows/ProcessWindows.h"
-#endif
-
-#include "llvm/Support/TargetSelect.h"
-
-#include <string>
-
-using namespace lldb_private;
-
-static void
-fatal_error_handler(void *user_data, const std::string &reason, bool gen_crash_diag)
-{
-    Host::SetCrashDescription(reason.c_str());
-    ::abort();
-}
-
-static bool g_inited_for_llgs = false;
-static void
-InitializeForLLGSPrivate()
-{
-    if (g_inited_for_llgs)
-        return;
-    g_inited_for_llgs = true;
-
-#if defined(_MSC_VER)
-    const char *disable_crash_dialog_var = getenv("LLDB_DISABLE_CRASH_DIALOG");
-    if (disable_crash_dialog_var && llvm::StringRef(disable_crash_dialog_var).equals_lower("true"))
-    {
-        // This will prevent Windows from displaying a dialog box requiring user interaction when
-        // LLDB crashes.  This is mostly useful when automating LLDB, for example via the test
-        // suite, so that a crash in LLDB does not prevent completion of the test suite.
-        ::SetErrorMode(GetErrorMode() | SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
-
-        _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
-        _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
-        _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
-        _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
-        _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
-        _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
-    }
-#endif
-
-    Log::Initialize();
-    HostInfo::Initialize();
-    Timer::Initialize();
-    Timer scoped_timer(__PRETTY_FUNCTION__, __PRETTY_FUNCTION__);
-
-    llvm::install_fatal_error_handler(fatal_error_handler, 0);
-
-    ProcessGDBRemoteLog::Initialize();
-
-    // Initialize plug-ins
-    ObjectContainerBSDArchive::Initialize();
-    ObjectFileELF::Initialize();
-    ObjectFilePECOFF::Initialize();
-    DynamicLoaderPOSIXDYLD::Initialize();
-    PlatformFreeBSD::Initialize();
-    PlatformLinux::Initialize();
-    PlatformWindows::Initialize();
-    PlatformKalimba::Initialize();
-    PlatformAndroid::Initialize();
-
-    //----------------------------------------------------------------------
-    // Apple/Darwin hosted plugins
-    //----------------------------------------------------------------------
-    DynamicLoaderMacOSXDYLD::Initialize();
-    ObjectContainerUniversalMachO::Initialize();
-
-    PlatformRemoteiOS::Initialize();
-    PlatformMacOSX::Initialize();
-    PlatformiOSSimulator::Initialize();
-
-#if defined(__APPLE__)
-    DynamicLoaderDarwinKernel::Initialize();
-    PlatformDarwinKernel::Initialize();
-    ObjectFileMachO::Initialize();
-#endif
-#if defined(__linux__)
-    static ConstString g_linux_log_name("linux");
-    ProcessPOSIXLog::Initialize(g_linux_log_name);
-#endif
-#ifndef LLDB_DISABLE_PYTHON
-    ScriptInterpreterPython::InitializePrivate();
-    OperatingSystemPython::Initialize();
-#endif
-}
-
-static bool g_inited = false;
-static void
-InitializePrivate()
-{
-    if (g_inited)
-        return;
-    g_inited = true;
-
-    InitializeForLLGSPrivate();
-
-    // Initialize LLVM and Clang
-    llvm::InitializeAllTargets();
-    llvm::InitializeAllAsmPrinters();
-    llvm::InitializeAllTargetMCs();
-    llvm::InitializeAllDisassemblers();
-
-    ABIMacOSX_i386::Initialize();
-    ABIMacOSX_arm::Initialize();
-    ABIMacOSX_arm64::Initialize();
-    ABISysV_x86_64::Initialize();
-    ABISysV_ppc::Initialize();
-    ABISysV_ppc64::Initialize();
-    DisassemblerLLVMC::Initialize();
-
-    JITLoaderGDB::Initialize();
-    ProcessElfCore::Initialize();
-    MemoryHistoryASan::Initialize();
-    AddressSanitizerRuntime::Initialize();
-
-    SymbolVendorELF::Initialize();
-    SymbolFileDWARF::Initialize();
-    SymbolFileSymtab::Initialize();
-    UnwindAssemblyInstEmulation::Initialize();
-    UnwindAssembly_x86::Initialize();
-    EmulateInstructionARM::Initialize();
-    EmulateInstructionARM64::Initialize();
-    EmulateInstructionMIPS64::Initialize();
-    SymbolFileDWARFDebugMap::Initialize();
-    ItaniumABILanguageRuntime::Initialize();
-    AppleObjCRuntimeV2::Initialize();
-    AppleObjCRuntimeV1::Initialize();
-    SystemRuntimeMacOSX::Initialize();
-
-#if defined(__linux__)
-    //----------------------------------------------------------------------
-    // Linux hosted plugins
-    //----------------------------------------------------------------------
-    ProcessLinux::Initialize();
-#endif
-#if defined(_MSC_VER)
-    DynamicLoaderWindows::Initialize();
-    ProcessWindows::Initialize();
-#endif
-#if defined(__FreeBSD__)
-    ProcessFreeBSD::Initialize();
-#endif
-#if defined(__APPLE__)
-    SymbolVendorMacOSX::Initialize();
-    ProcessKDP::Initialize();
-    ProcessMachCore::Initialize();
-#endif
-    //----------------------------------------------------------------------
-    // Platform agnostic plugins
-    //----------------------------------------------------------------------
-    PlatformRemoteGDBServer::Initialize();
-
-    ProcessGDBRemote::Initialize();
-    DynamicLoaderStatic::Initialize();
-
-    // Scan for any system or user LLDB plug-ins
-    PluginManager::Initialize();
-
-    // The process settings need to know about installed plug-ins, so the Settings must be initialized
-    // AFTER PluginManager::Initialize is called.
-
-    Debugger::SettingsInitialize();
-}
-
-static void
-TerminateForLLGSPrivate()
-{
-    if (!g_inited_for_llgs)
-        return;
-    g_inited_for_llgs = false;
-
-    Timer scoped_timer(__PRETTY_FUNCTION__, __PRETTY_FUNCTION__);
-    ObjectContainerBSDArchive::Terminate();
-    ObjectFileELF::Terminate();
-    ObjectFilePECOFF::Terminate();
-    DynamicLoaderPOSIXDYLD::Terminate();
-    PlatformFreeBSD::Terminate();
-    PlatformLinux::Terminate();
-    PlatformWindows::Terminate();
-    PlatformKalimba::Terminate();
-    PlatformAndroid::Terminate();
-    DynamicLoaderMacOSXDYLD::Terminate();
-    ObjectContainerUniversalMachO::Terminate();
-    PlatformMacOSX::Terminate();
-    PlatformRemoteiOS::Terminate();
-    PlatformiOSSimulator::Terminate();
-
-#if defined(__APPLE__)
-    DynamicLoaderDarwinKernel::Terminate();
-    ObjectFileMachO::Terminate();
-    PlatformDarwinKernel::Terminate();
-#endif
-
-#ifndef LLDB_DISABLE_PYTHON
-    OperatingSystemPython::Terminate();
-#endif
-
-    Log::Terminate();
-}
-
-static void
-TerminatePrivate()
-{
-
-    if (!g_inited)
-        return;
-    g_inited = false;
-
-    Timer scoped_timer(__PRETTY_FUNCTION__, __PRETTY_FUNCTION__);
-    // Terminate and unload and loaded system or user LLDB plug-ins
-    PluginManager::Terminate();
-    ABIMacOSX_i386::Terminate();
-    ABIMacOSX_arm::Terminate();
-    ABIMacOSX_arm64::Terminate();
-    ABISysV_x86_64::Terminate();
-    ABISysV_ppc::Terminate();
-    ABISysV_ppc64::Terminate();
-    DisassemblerLLVMC::Terminate();
-
-    JITLoaderGDB::Terminate();
-    ProcessElfCore::Terminate();
-    MemoryHistoryASan::Terminate();
-    AddressSanitizerRuntime::Terminate();
-    SymbolVendorELF::Terminate();
-    SymbolFileDWARF::Terminate();
-    SymbolFileSymtab::Terminate();
-    UnwindAssembly_x86::Terminate();
-    UnwindAssemblyInstEmulation::Terminate();
-    EmulateInstructionARM::Terminate();
-    EmulateInstructionARM64::Terminate();
-    EmulateInstructionMIPS64::Terminate();
-    SymbolFileDWARFDebugMap::Terminate();
-    ItaniumABILanguageRuntime::Terminate();
-    AppleObjCRuntimeV2::Terminate();
-    AppleObjCRuntimeV1::Terminate();
-    SystemRuntimeMacOSX::Terminate();
-
-#if defined(__APPLE__)
-    ProcessMachCore::Terminate();
-    ProcessKDP::Terminate();
-    SymbolVendorMacOSX::Terminate();
-#endif
-#if defined(_MSC_VER)
-    DynamicLoaderWindows::Terminate();
-#endif
-
-#if defined(__linux__)
-    ProcessLinux::Terminate();
-#endif
-
-#if defined(__FreeBSD__)
-    ProcessFreeBSD::Terminate();
-#endif
-    Debugger::SettingsTerminate();
-
-    PlatformRemoteGDBServer::Terminate();
-    ProcessGDBRemote::Terminate();
-    DynamicLoaderStatic::Terminate();
-
-    TerminateForLLGSPrivate();
-}
-
-void
-lldb_private::InitializeForLLGS(LoadPluginCallbackType load_plugin_callback)
-{
-    // Make sure we initialize only once
-    static Mutex g_inited_mutex(Mutex::eMutexTypeRecursive);
-    Mutex::Locker locker(g_inited_mutex);
-
-    // Call the actual initializers.  If we've already been initialized this
-    // will do nothing.
-    InitializeForLLGSPrivate();
-
-    // We want to call Debuger::Initialize every time, even if we've already
-    // been initialized, so that the debugger ref count increases.
-    Debugger::Initialize(load_plugin_callback);
-}
-
-void
-lldb_private::Initialize(LoadPluginCallbackType load_plugin_callback)
-{
-    // Make sure we initialize only once
-    static Mutex g_inited_mutex(Mutex::eMutexTypeRecursive);
-    Mutex::Locker locker(g_inited_mutex);
-
-    // Call the actual initializers.  If we've already been initialized this
-    // will do nothing.
-    InitializeForLLGSPrivate();
-    InitializePrivate();
-
-    // We want to call Debuger::Initialize every time, even if we've already
-    // been initialized, so that the debugger ref count increases.
-    Debugger::Initialize(load_plugin_callback);
-}
-
-void
-lldb_private::TerminateLLGS()
-{
-    // Terminate the debugger.  If the ref count is still greater than 0, we
-    // shouldn't shutdown yet.
-    if (Debugger::Terminate() > 0)
-        return;
-
-    TerminateForLLGSPrivate();
-}
-
-void
-lldb_private::Terminate()
-{
-    // Terminate the debugger.  If the ref count is still greater than 0, we
-    // shouldn't shutdown yet.
-    if (Debugger::Terminate() > 0)
-        return;
-
-    TerminatePrivate();
-}

source/Initialization/SystemInitializer.cpp

+//===-- SystemInitializer.cpp -----------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/Initialization/SystemInitializer.h"
+
+using namespace lldb_private;
+
+SystemInitializer::SystemInitializer()
+{
+}
+
+SystemInitializer::~SystemInitializer()
+{
+}

source/Initialization/SystemInitializerCommon.cpp

+//===-- SystemInitializerCommon.cpp -----------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/Initialization/SystemInitializerCommon.h"
+
+#include "lldb/Host/Host.h"
+#include "lldb/Host/HostInfo.h"
+#include "lldb/Core/Log.h"
+#include "lldb/Core/Timer.h"
+#include "lldb/Interpreter/ScriptInterpreterPython.h"
+
+#include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h"
+#include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h"
+#include "Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h"
+#include "Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h"
+#include "Plugins/ObjectFile/ELF/ObjectFileELF.h"
+#include "Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h"
+#include "Plugins/OperatingSystem/Python/OperatingSystemPython.h"
+#include "Plugins/Platform/Android/PlatformAndroid.h"
+#include "Plugins/Platform/FreeBSD/PlatformFreeBSD.h"
+#include "Plugins/Platform/Kalimba/PlatformKalimba.h"
+#include "Plugins/Platform/Linux/PlatformLinux.h"
+#include "Plugins/Platform/MacOSX/PlatformiOSSimulator.h"
+#include "Plugins/Platform/MacOSX/PlatformMacOSX.h"
+#include "Plugins/Platform/MacOSX/PlatformRemoteiOS.h"
+#include "Plugins/Platform/Windows/PlatformWindows.h"
+#include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h"
+
+#if defined(__APPLE__)
+#include "Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h"
+#include "Plugins/ObjectFile/Mach-O/ObjectFileMachO.h"
+#include "Plugins/Platform/MacOSX/PlatformDarwinKernel.h"
+#endif
+
+#if defined(__linux__)
+#include "Plugins/Process/Linux/ProcessLinux.h"
+#include "Plugins/Process/POSIX/ProcessPOSIXLog.h"
+#endif
+
+#if defined(_MSC_VER)
+#include "lldb/Host/windows/windows.h"
+#endif
+
+#include "llvm/Support/TargetSelect.h"
+
+#include <string>
+
+using namespace lldb_private;
+
+static void
+fatal_error_handler(void *user_data, const std::string &reason, bool gen_crash_diag)
+{
+    Host::SetCrashDescription(reason.c_str());
+    ::abort();
+}
+
+SystemInitializerCommon::SystemInitializerCommon()
+{
+}
+
+SystemInitializerCommon::~SystemInitializerCommon()
+{
+}
+
+void
+SystemInitializerCommon::Initialize()
+{
+#if defined(_MSC_VER)
+    const char *disable_crash_dialog_var = getenv("LLDB_DISABLE_CRASH_DIALOG");
+    if (disable_crash_dialog_var && llvm::StringRef(disable_crash_dialog_var).equals_lower("true"))
+    {
+        // This will prevent Windows from displaying a dialog box requiring user interaction when
+        // LLDB crashes.  This is mostly useful when automating LLDB, for example via the test
+        // suite, so that a crash in LLDB does not prevent completion of the test suite.
+        ::SetErrorMode(GetErrorMode() | SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
+
+        _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+        _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+        _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+        _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
+        _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+        _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
+    }
+#endif
+
+    Log::Initialize();
+    HostInfo::Initialize();
+    Timer::Initialize();
+    Timer scoped_timer(__PRETTY_FUNCTION__, __PRETTY_FUNCTION__);
+
+    llvm::install_fatal_error_handler(fatal_error_handler, 0);
+
+    ProcessGDBRemoteLog::Initialize();
+
+    // Initialize plug-ins
+    ObjectContainerBSDArchive::Initialize();
+    ObjectFileELF::Initialize();
+    ObjectFilePECOFF::Initialize();
+    DynamicLoaderPOSIXDYLD::Initialize();
+    PlatformFreeBSD::Initialize();
+    PlatformLinux::Initialize();
+    PlatformWindows::Initialize();
+    PlatformKalimba::Initialize();
+    PlatformAndroid::Initialize();
+
+    //----------------------------------------------------------------------
+    // Apple/Darwin hosted plugins
+    //----------------------------------------------------------------------
+    DynamicLoaderMacOSXDYLD::Initialize();
+    ObjectContainerUniversalMachO::Initialize();
+
+    PlatformRemoteiOS::Initialize();
+    PlatformMacOSX::Initialize();
+    PlatformiOSSimulator::Initialize();
+
+#if defined(__APPLE__)
+    DynamicLoaderDarwinKernel::Initialize();
+    PlatformDarwinKernel::Initialize();
+    ObjectFileMachO::Initialize();
+#endif
+#if defined(__linux__)
+    static ConstString g_linux_log_name("linux");
+    ProcessPOSIXLog::Initialize(g_linux_log_name);
+#endif
+#ifndef LLDB_DISABLE_PYTHON
+    ScriptInterpreterPython::InitializePrivate();
+    OperatingSystemPython::Initialize();
+#endif
+}
+
+void
+SystemInitializerCommon::Terminate()
+{
+    Timer scoped_timer(__PRETTY_FUNCTION__, __PRETTY_FUNCTION__);
+    ObjectContainerBSDArchive::Terminate();
+    ObjectFileELF::Terminate();
+    ObjectFilePECOFF::Terminate();
+    DynamicLoaderPOSIXDYLD::Terminate();
+    PlatformFreeBSD::Terminate();
+    PlatformLinux::Terminate();
+    PlatformWindows::Terminate();
+    PlatformKalimba::Terminate();
+    PlatformAndroid::Terminate();
+    DynamicLoaderMacOSXDYLD::Terminate();
+    ObjectContainerUniversalMachO::Terminate();
+    PlatformMacOSX::Terminate();
+    PlatformRemoteiOS::Terminate();
+    PlatformiOSSimulator::Terminate();
+
+#if defined(__APPLE__)
+    DynamicLoaderDarwinKernel::Terminate();
+    ObjectFileMachO::Terminate();
+    PlatformDarwinKernel::Terminate();
+#endif
+
+#ifndef LLDB_DISABLE_PYTHON
+    OperatingSystemPython::Terminate();
+#endif
+
+    Log::Terminate();
+}

source/Initialization/SystemLifetimeManager.cpp

+//===-- SystemLifetimeManager.cpp ------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/Initialization/SystemLifetimeManager.h"
+
+#include "lldb/Core/Debugger.h"
+#include "lldb/Host/Mutex.h"
+#include "lldb/Initialization/SystemInitializer.h"
+
+#include <utility>
+
+using namespace lldb_private;
+
+SystemLifetimeManager::SystemLifetimeManager(std::unique_ptr<SystemInitializer> initializer,
+                                             LoadPluginCallbackType plugin_callback)
+    : m_mutex(Mutex::eMutexTypeNormal)
+    , m_initializer(std::move(initializer))
+    , m_plugin_callback(plugin_callback)
+    , m_ref_count(0)
+{
+}
+
+SystemLifetimeManager::~SystemLifetimeManager()
+{
+    assert(m_ref_count == 0 && "SystemLifetimeManager destroyed with non-zero refcount!");
+}
+
+uint32_t
+SystemLifetimeManager::AddRef()
+{
+    Mutex::Locker locker(m_mutex);
+
+    // Actually initialize the system.  We only do this the first time it's
+    // initialized.
+    if (++m_ref_count == 1)
+        m_initializer->Initialize();
+
+    // We want to call Debuger::Initialize every time, even if we've already
+    // been initialized, because the debugger contains its own refcount.
+    Debugger::Initialize(m_plugin_callback);
+
+    return m_ref_count;
+}
+
+uint32_t
+SystemLifetimeManager::Release()
+{
+    Mutex::Locker locker(m_mutex);
+
+    assert(m_ref_count != 0 && "Attempting to call SystemLifetimeManager::Release() with m_ref_count==0!");
+
+    // We want to call Debuger::Terminate every time, even with a positive
+    // refcount, because the debugger manages its own internal refcount.
+    // To maintain correct order of operations, we call Debugger::Terminate
+    // in reverse order from how we called Debugger::Initialize.
+    Debugger::Terminate();
+
+    // Actually shutdown the system.  We only do this if the ref count just
+    // reached 0.
+    if (--m_ref_count == 0)
+    {
+        // Don't reset the shared_ptr.  This way someone can theoretically call
+        // Initialize again to re-initialize the system.
+        m_initializer->Terminate();
+    }
+
+    return m_ref_count;
+}

tools/lldb-server/lldb-server.cpp

 //===----------------------------------------------------------------------===//
 
 #include "lldb/Core/Debugger.h"
-#include "lldb/Initialization/InitializeLLDB.h"
+#include "lldb/Initialization/SystemLifetimeManager.h"
+#include "lldb/Initialization/SystemInitializerCommon.h"
+
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/Support/ManagedStatic.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
+namespace
+{
+// LLDBServerLifetimeManager is just a shim around SystemLifetimeManager so that
+// we can have a default constructor that calls SystemLifetimeManager's
+// constructor with the right arguments (a requirement of llvm::ManagedStatic)
+class LLDBServerLifetimeManager : public lldb_private::SystemLifetimeManager
+{
+  public:
+    LLDBServerLifetimeManager()
+        : SystemLifetimeManager(llvm::make_unique<lldb_private::SystemInitializerCommon>(), nullptr)
+    {
+    }
+};
+}
+
+static llvm::ManagedStatic<LLDBServerLifetimeManager> g_debugger_lifetime;
+
 static void
 display_usage (const char *progname)
 {

 static void
 initialize ()
 {
-    lldb_private::InitializeForLLGS(nullptr);
+    g_debugger_lifetime->AddRef();
 }
 
 static void
 terminate ()
 {
-    lldb_private::TerminateLLGS();
+    g_debugger_lifetime->Release();
 }
 
 //----------------------------------------------------------------------