diff options
Diffstat (limited to 'source/Initialization')
| -rw-r--r-- | source/Initialization/Makefile | 14 | ||||
| -rw-r--r-- | source/Initialization/SystemInitializerCommon.cpp | 67 | ||||
| -rw-r--r-- | source/Initialization/SystemLifetimeManager.cpp | 9 |
3 files changed, 6 insertions, 84 deletions
diff --git a/source/Initialization/Makefile b/source/Initialization/Makefile deleted file mode 100644 index a63f4733bb6e4..0000000000000 --- a/source/Initialization/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -##===- source/Initialize/Makefile -------------------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## - -LLDB_LEVEL := ../.. -LIBRARYNAME := lldbInitialization -BUILD_ARCHIVE = 1 - -include $(LLDB_LEVEL)/Makefile diff --git a/source/Initialization/SystemInitializerCommon.cpp b/source/Initialization/SystemInitializerCommon.cpp index 6cbc0b707df4b..258f9c8872e2b 100644 --- a/source/Initialization/SystemInitializerCommon.cpp +++ b/source/Initialization/SystemInitializerCommon.cpp @@ -13,11 +13,6 @@ #include "lldb/Host/HostInfo.h" #include "lldb/Core/Log.h" #include "lldb/Core/Timer.h" -#include "lldb/Symbol/GoASTContext.h" -#include "lldb/Symbol/ClangASTContext.h" -#include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h" -#include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h" -#include "Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h" #include "Plugins/Instruction/ARM/EmulateInstructionARM.h" #include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h" #include "Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h" @@ -25,23 +20,10 @@ #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/OperatingSystem/Go/OperatingSystemGo.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/PlatformMacOSX.h" -#include "Plugins/Platform/MacOSX/PlatformRemoteiOS.h" -#include "Plugins/Platform/NetBSD/PlatformNetBSD.h" -#include "Plugins/Platform/Windows/PlatformWindows.h" #include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h" #if defined(__APPLE__) -#include "Plugins/Platform/MacOSX/PlatformiOSSimulator.h" -#include "Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h" #include "Plugins/ObjectFile/Mach-O/ObjectFileMachO.h" -#include "Plugins/Platform/MacOSX/PlatformDarwinKernel.h" #endif #if defined(__linux__) @@ -49,8 +31,8 @@ #endif #if defined(_MSC_VER) -#include "lldb/Host/windows/windows.h" #include "Plugins/Process/Windows/Common/ProcessWindowsLog.h" +#include "lldb/Host/windows/windows.h" #endif #include "llvm/Support/TargetSelect.h" @@ -97,7 +79,6 @@ SystemInitializerCommon::Initialize() Log::Initialize(); HostInfo::Initialize(); - Timer::Initialize(); Timer scoped_timer(__PRETTY_FUNCTION__, __PRETTY_FUNCTION__); llvm::install_fatal_error_handler(fatal_error_handler, 0); @@ -105,20 +86,9 @@ SystemInitializerCommon::Initialize() process_gdb_remote::ProcessGDBRemoteLog::Initialize(); // Initialize plug-ins - ClangASTContext::Initialize(); - GoASTContext::Initialize(); - ObjectContainerBSDArchive::Initialize(); ObjectFileELF::Initialize(); ObjectFilePECOFF::Initialize(); - DynamicLoaderPOSIXDYLD::Initialize(); - DynamicLoaderWindowsDYLD::Initialize(); - platform_freebsd::PlatformFreeBSD::Initialize(); - platform_linux::PlatformLinux::Initialize(); - platform_netbsd::PlatformNetBSD::Initialize(); - PlatformWindows::Initialize(); - PlatformKalimba::Initialize(); - platform_android::PlatformAndroid::Initialize(); EmulateInstructionARM::Initialize(); EmulateInstructionMIPS::Initialize(); @@ -127,16 +97,10 @@ SystemInitializerCommon::Initialize() //---------------------------------------------------------------------- // Apple/Darwin hosted plugins //---------------------------------------------------------------------- - DynamicLoaderMacOSXDYLD::Initialize(); ObjectContainerUniversalMachO::Initialize(); - PlatformRemoteiOS::Initialize(); - PlatformMacOSX::Initialize(); #if defined(__APPLE__) - PlatformiOSSimulator::Initialize(); - DynamicLoaderDarwinKernel::Initialize(); - PlatformDarwinKernel::Initialize(); ObjectFileMachO::Initialize(); #endif #if defined(__linux__) @@ -146,10 +110,6 @@ SystemInitializerCommon::Initialize() #if defined(_MSC_VER) ProcessWindowsLog::Initialize(); #endif -#ifndef LLDB_DISABLE_PYTHON - OperatingSystemPython::Initialize(); -#endif - OperatingSystemGo::Initialize(); } void @@ -159,41 +119,20 @@ SystemInitializerCommon::Terminate() ObjectContainerBSDArchive::Terminate(); ObjectFileELF::Terminate(); ObjectFilePECOFF::Terminate(); - DynamicLoaderPOSIXDYLD::Terminate(); - DynamicLoaderWindowsDYLD::Terminate(); - platform_freebsd::PlatformFreeBSD::Terminate(); - platform_linux::PlatformLinux::Terminate(); - platform_netbsd::PlatformNetBSD::Terminate(); - PlatformWindows::Terminate(); - PlatformKalimba::Terminate(); - platform_android::PlatformAndroid::Terminate(); - DynamicLoaderMacOSXDYLD::Terminate(); - ObjectContainerUniversalMachO::Terminate(); - PlatformMacOSX::Terminate(); - PlatformRemoteiOS::Terminate(); - - ClangASTContext::Terminate(); - GoASTContext::Terminate(); EmulateInstructionARM::Terminate(); EmulateInstructionMIPS::Terminate(); EmulateInstructionMIPS64::Terminate(); + ObjectContainerUniversalMachO::Terminate(); #if defined(__APPLE__) - PlatformiOSSimulator::Terminate(); - DynamicLoaderDarwinKernel::Terminate(); ObjectFileMachO::Terminate(); - PlatformDarwinKernel::Terminate(); #endif #if defined(_MSC_VER) ProcessWindowsLog::Terminate(); #endif -#ifndef LLDB_DISABLE_PYTHON - OperatingSystemPython::Terminate(); -#endif - OperatingSystemGo::Terminate(); - + HostInfo::Terminate(); Log::Terminate(); } diff --git a/source/Initialization/SystemLifetimeManager.cpp b/source/Initialization/SystemLifetimeManager.cpp index eafbe68c99842..0f61622b31b02 100644 --- a/source/Initialization/SystemLifetimeManager.cpp +++ b/source/Initialization/SystemLifetimeManager.cpp @@ -10,16 +10,13 @@ #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() - : m_mutex(Mutex::eMutexTypeRecursive) - , m_initialized(false) +SystemLifetimeManager::SystemLifetimeManager() : m_mutex(), m_initialized(false) { } @@ -32,7 +29,7 @@ void SystemLifetimeManager::Initialize(std::unique_ptr<SystemInitializer> initializer, LoadPluginCallbackType plugin_callback) { - Mutex::Locker locker(m_mutex); + std::lock_guard<std::recursive_mutex> guard(m_mutex); if (!m_initialized) { assert(!m_initializer && @@ -48,7 +45,7 @@ SystemLifetimeManager::Initialize(std::unique_ptr<SystemInitializer> initializer void SystemLifetimeManager::Terminate() { - Mutex::Locker locker(m_mutex); + std::lock_guard<std::recursive_mutex> guard(m_mutex); if (m_initialized) { |