From 3c4f89d7029ad73ce25c798ab2109d3eea7d7151 Mon Sep 17 00:00:00 2001 From: Tamas Berghammer Date: Thu, 12 Feb 2015 18:18:27 +0000 Subject: [PATCH] Add Initialize/Terminate method to Platform base plugin Platform holds a smart pointer to each platform object created in a static variable what cause the platform destructors called only on program exit when other static variables are not availables. With this change the destructors are called on lldb_private::Terminate() + Fix DebuggerRefCount handling in ScriptInterpreterPython Differential Revision: http://reviews.llvm.org/D7590 llvm-svn: 228944 --- lldb/include/lldb/Target/Platform.h | 8 ++++++- .../Interpreter/ScriptInterpreterPython.cpp | 12 ++++++++++ .../Platform/Android/PlatformAndroid.cpp | 4 ++++ .../Platform/FreeBSD/PlatformFreeBSD.cpp | 4 ++++ .../Platform/Kalimba/PlatformKalimba.cpp | 4 ++++ .../Plugins/Platform/Linux/PlatformLinux.cpp | 4 ++++ .../Platform/MacOSX/PlatformDarwinKernel.cpp | 4 ++++ .../Platform/MacOSX/PlatformMacOSX.cpp | 4 ++++ .../Platform/MacOSX/PlatformRemoteiOS.cpp | 4 ++++ .../Platform/MacOSX/PlatformiOSSimulator.cpp | 4 ++++ .../Platform/Windows/PlatformWindows.cpp | 4 ++++ .../gdb-server/PlatformRemoteGDBServer.cpp | 4 ++++ lldb/source/Target/Platform.cpp | 23 ++++++++++++++++++- lldb/source/lldb.cpp | 1 + 14 files changed, 82 insertions(+), 2 deletions(-) diff --git a/lldb/include/lldb/Target/Platform.h b/lldb/include/lldb/Target/Platform.h index f4596bd00f0b..d7e3a171826c 100644 --- a/lldb/include/lldb/Target/Platform.h +++ b/lldb/include/lldb/Target/Platform.h @@ -50,8 +50,14 @@ namespace lldb_private { { public: + static void + Initialize (); + + static void + Terminate (); + //------------------------------------------------------------------ - /// Get the native host platform plug-in. + /// Get the native host platform plug-in. /// /// There should only be one of these for each host that LLDB runs /// upon that should be statically compiled in and registered using diff --git a/lldb/source/Interpreter/ScriptInterpreterPython.cpp b/lldb/source/Interpreter/ScriptInterpreterPython.cpp index 8155cbb189fe..84472411e0f2 100644 --- a/lldb/source/Interpreter/ScriptInterpreterPython.cpp +++ b/lldb/source/Interpreter/ScriptInterpreterPython.cpp @@ -2825,8 +2825,20 @@ ScriptInterpreterPython::InitializePrivate () } } + // Importing 'lldb' module calls SBDebugger::Initialize, which calls Debugger::Initialize, which increments a + // global debugger ref-count; therefore we need to check the ref-count before and after importing lldb, and if the + // ref-count increased we need to call Debugger::Terminate here to decrement the ref-count so that when the final + // call to Debugger::Terminate is made, the ref-count has the correct value. + + int old_count = Debugger::TestDebuggerRefCount (); + PyRun_SimpleString ("sys.dont_write_bytecode = 1; import lldb.embedded_interpreter; from lldb.embedded_interpreter import run_python_interpreter; from lldb.embedded_interpreter import run_one_line"); + int new_count = Debugger::TestDebuggerRefCount (); + + if (new_count > old_count) + Debugger::Terminate (); + if (threads_already_initialized) { if (log) log->Printf("Releasing PyGILState. Returning to state = %slocked\n", gstate == PyGILState_UNLOCKED ? "un" : ""); diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp b/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp index e89254d89f03..5628284476d0 100644 --- a/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp +++ b/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp @@ -25,6 +25,8 @@ static uint32_t g_initialize_count = 0; void PlatformAndroid::Initialize () { + PlatformLinux::Initialize (); + if (g_initialize_count++ == 0) { PluginManager::RegisterPlugin (PlatformAndroid::GetPluginNameStatic(), @@ -43,6 +45,8 @@ PlatformAndroid::Terminate () PluginManager::UnregisterPlugin (PlatformAndroid::CreateInstance); } } + + PlatformLinux::Terminate (); } PlatformSP diff --git a/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp b/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp index 3b38a5819934..d795e0c023d6 100644 --- a/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp +++ b/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp @@ -118,6 +118,8 @@ static uint32_t g_initialize_count = 0; void PlatformFreeBSD::Initialize () { + Platform::Initialize (); + if (g_initialize_count++ == 0) { #if defined (__FreeBSD__) @@ -137,6 +139,8 @@ PlatformFreeBSD::Terminate () { if (g_initialize_count > 0 && --g_initialize_count == 0) PluginManager::UnregisterPlugin (PlatformFreeBSD::CreateInstance); + + Platform::Terminate (); } //------------------------------------------------------------------ diff --git a/lldb/source/Plugins/Platform/Kalimba/PlatformKalimba.cpp b/lldb/source/Plugins/Platform/Kalimba/PlatformKalimba.cpp index b3729e2976d5..f4f1fb4f297e 100644 --- a/lldb/source/Plugins/Platform/Kalimba/PlatformKalimba.cpp +++ b/lldb/source/Plugins/Platform/Kalimba/PlatformKalimba.cpp @@ -76,6 +76,8 @@ PlatformKalimba::GetPluginName() void PlatformKalimba::Initialize () { + Platform::Initialize (); + if (g_initialize_count++ == 0) { PluginManager::RegisterPlugin(PlatformKalimba::GetPluginNameStatic(false), @@ -94,6 +96,8 @@ PlatformKalimba::Terminate () PluginManager::UnregisterPlugin (PlatformKalimba::CreateInstance); } } + + Platform::Terminate (); } Error diff --git a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp index a6998a51ebac..c70e0849585d 100644 --- a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp +++ b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp @@ -242,6 +242,8 @@ PlatformLinux::GetPluginName() void PlatformLinux::Initialize () { + PlatformPOSIX::Initialize (); + if (g_initialize_count++ == 0) { #if defined(__linux__) @@ -266,6 +268,8 @@ PlatformLinux::Terminate () PluginManager::UnregisterPlugin (PlatformLinux::CreateInstance); } } + + PlatformPOSIX::Terminate (); } Error diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp index a807c3360ae8..eb9ca451069d 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp @@ -51,6 +51,8 @@ static uint32_t g_initialize_count = 0; void PlatformDarwinKernel::Initialize () { + PlatformDarwin::Initialize (); + if (g_initialize_count++ == 0) { PluginManager::RegisterPlugin (PlatformDarwinKernel::GetPluginNameStatic(), @@ -70,6 +72,8 @@ PlatformDarwinKernel::Terminate () PluginManager::UnregisterPlugin (PlatformDarwinKernel::CreateInstance); } } + + PlatformDarwin::Terminate (); } PlatformSP diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp index 55a30bcc50cc..aef8034f42ee 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp @@ -40,6 +40,8 @@ static uint32_t g_initialize_count = 0; void PlatformMacOSX::Initialize () { + PlatformDarwin::Initialize (); + if (g_initialize_count++ == 0) { #if defined (__APPLE__) @@ -64,6 +66,8 @@ PlatformMacOSX::Terminate () PluginManager::UnregisterPlugin (PlatformMacOSX::CreateInstance); } } + + PlatformDarwin::Terminate (); } PlatformSP diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp index 8bdd3cb4b1e1..25509c3902a1 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp @@ -63,6 +63,8 @@ static uint32_t g_initialize_count = 0; void PlatformRemoteiOS::Initialize () { + PlatformDarwin::Initialize (); + if (g_initialize_count++ == 0) { PluginManager::RegisterPlugin (PlatformRemoteiOS::GetPluginNameStatic(), @@ -81,6 +83,8 @@ PlatformRemoteiOS::Terminate () PluginManager::UnregisterPlugin (PlatformRemoteiOS::CreateInstance); } } + + PlatformDarwin::Terminate (); } PlatformSP diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp index a6ffce7c9526..70c81a27ad3a 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp @@ -41,6 +41,8 @@ static uint32_t g_initialize_count = 0; void PlatformiOSSimulator::Initialize () { + PlatformDarwin::Initialize (); + if (g_initialize_count++ == 0) { PluginManager::RegisterPlugin (PlatformiOSSimulator::GetPluginNameStatic(), @@ -59,6 +61,8 @@ PlatformiOSSimulator::Terminate () PluginManager::UnregisterPlugin (PlatformiOSSimulator::CreateInstance); } } + + PlatformDarwin::Terminate (); } PlatformSP diff --git a/lldb/source/Plugins/Platform/Windows/PlatformWindows.cpp b/lldb/source/Plugins/Platform/Windows/PlatformWindows.cpp index ade4dccf6f8f..3843e955a812 100644 --- a/lldb/source/Plugins/Platform/Windows/PlatformWindows.cpp +++ b/lldb/source/Plugins/Platform/Windows/PlatformWindows.cpp @@ -146,6 +146,8 @@ PlatformWindows::GetPluginName(void) void PlatformWindows::Initialize(void) { + Platform::Initialize (); + if (g_initialize_count++ == 0) { #if defined (_WIN32) @@ -175,6 +177,8 @@ PlatformWindows::Terminate( void ) PluginManager::UnregisterPlugin (PlatformWindows::CreateInstance); } } + + Platform::Terminate (); } //------------------------------------------------------------------ diff --git a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp index 4365a9600867..1de07ffbafef 100644 --- a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp +++ b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp @@ -40,6 +40,8 @@ static bool g_initialized = false; void PlatformRemoteGDBServer::Initialize () { + Platform::Initialize (); + if (g_initialized == false) { g_initialized = true; @@ -57,6 +59,8 @@ PlatformRemoteGDBServer::Terminate () g_initialized = false; PluginManager::UnregisterPlugin (PlatformRemoteGDBServer::CreateInstance); } + + Platform::Terminate (); } PlatformSP diff --git a/lldb/source/Target/Platform.cpp b/lldb/source/Target/Platform.cpp index f4c387ad6915..97be08490e48 100644 --- a/lldb/source/Target/Platform.cpp +++ b/lldb/source/Target/Platform.cpp @@ -29,7 +29,9 @@ using namespace lldb; using namespace lldb_private; - + +static uint32_t g_initialize_count = 0; + // Use a singleton function for g_local_platform_sp to avoid init // constructors since LLDB is often part of a shared library static PlatformSP& @@ -75,6 +77,25 @@ GetPlatformListMutex () return g_mutex; } +void +Platform::Initialize () +{ + g_initialize_count++; +} + +void +Platform::Terminate () +{ + if (g_initialize_count > 0) + { + if (--g_initialize_count == 0) + { + Mutex::Locker locker(GetPlatformListMutex ()); + GetPlatformList().clear(); + } + } +} + void Platform::SetHostPlatform (const lldb::PlatformSP &platform_sp) { diff --git a/lldb/source/lldb.cpp b/lldb/source/lldb.cpp index 25033b7830c1..d2c9573b9a7c 100644 --- a/lldb/source/lldb.cpp +++ b/lldb/source/lldb.cpp @@ -313,6 +313,7 @@ lldb_private::Terminate () ProcessFreeBSD::Terminate(); #endif + PlatformRemoteGDBServer::Terminate(); ProcessGDBRemote::Terminate(); DynamicLoaderStatic::Terminate();