mib created this revision.
mib added reviewers: jingham, JDevlieghere.
mib added a project: LLDB.
Herald added a project: All.
mib requested review of this revision.
Herald added a subscriber: lldb-commits.
This patch attempts to fix a dead lock when loading modules in a Scripted
Process.
This issue was triggered by loading the modules after the process did resume,
but before the process actually stop, causing the language runtime mutex to
be locked by a separate thread, responsible to unwind the stack (using
the runtime unwind plan), while the module loading thread was trying to
notify the runtimes of the newly loaded module.
To address that, this patch moves the module loading logic to be done before
sending the stop event, to prevent the dead lock situation described above.
Signed-off-by: Med Ismail Bennani <ism...@bennani.ma>
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D154649
Files:
lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp
lldb/source/Plugins/Process/scripted/ScriptedProcess.h
Index: lldb/source/Plugins/Process/scripted/ScriptedProcess.h
===================================================================
--- lldb/source/Plugins/Process/scripted/ScriptedProcess.h
+++ lldb/source/Plugins/Process/scripted/ScriptedProcess.h
@@ -12,6 +12,7 @@
#include "lldb/Target/Process.h"
#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/ScriptedMetadata.h"
+#include "lldb/Utility/State.h"
#include "lldb/Utility/Status.h"
#include "ScriptedThread.h"
@@ -93,6 +94,8 @@
void *GetImplementation() override;
void ForceScriptedState(lldb::StateType state) override {
+ if (StateIsStoppedState(state, true))
+ GetLoadedDynamicLibrariesInfos();
SetPrivateState(state);
}
Index: lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp
===================================================================
--- lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp
+++ lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp
@@ -166,7 +166,6 @@
void ScriptedProcess::DidResume() {
// Update the PID again, in case the user provided a placeholder pid at
launch
m_pid = GetInterface().GetProcessID();
- GetLoadedDynamicLibrariesInfos();
}
Status ScriptedProcess::DoResume() {
Index: lldb/source/Plugins/Process/scripted/ScriptedProcess.h
===================================================================
--- lldb/source/Plugins/Process/scripted/ScriptedProcess.h
+++ lldb/source/Plugins/Process/scripted/ScriptedProcess.h
@@ -12,6 +12,7 @@
#include "lldb/Target/Process.h"
#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/ScriptedMetadata.h"
+#include "lldb/Utility/State.h"
#include "lldb/Utility/Status.h"
#include "ScriptedThread.h"
@@ -93,6 +94,8 @@
void *GetImplementation() override;
void ForceScriptedState(lldb::StateType state) override {
+ if (StateIsStoppedState(state, true))
+ GetLoadedDynamicLibrariesInfos();
SetPrivateState(state);
}
Index: lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp
===================================================================
--- lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp
+++ lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp
@@ -166,7 +166,6 @@
void ScriptedProcess::DidResume() {
// Update the PID again, in case the user provided a placeholder pid at launch
m_pid = GetInterface().GetProcessID();
- GetLoadedDynamicLibrariesInfos();
}
Status ScriptedProcess::DoResume() {
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
