[Lldb-commits] [lldb] r160140 - in /lldb/trunk: include/lldb/API/SBProcess.h include/lldb/Core/ModuleList.h include/lldb/Interpreter/CommandInterpreter.h source/API/SBProcess.cpp source/Core/ModuleList.cpp source/Interpreter/CommandInterpreter.cpp
Greg Clayton
gclayton at apple.com
Thu Jul 12 13:32:19 PDT 2012
Author: gclayton
Date: Thu Jul 12 15:32:19 2012
New Revision: 160140
URL: http://llvm.org/viewvc/llvm-project?rev=160140&view=rev
Log:
<rdar://problem/11791234>
Fixed a case where the python interpreter could end up holding onto a previous lldb::SBProcess (probably in lldb.process) when run under Xcode. Prior to this fix, the lldb::SBProcess held onto a shared pointer to a lldb_private::Process. This in turn could cause the process to still have a thread list with stack frames. The stack frames would have module shared pointers in the lldb_private::SymbolContext objects.
We also had issues with things staying in the shared module list too long when we found things by UUID (we didn't remove the out of date ModuleSP from the global module cache).
Now all of this is fixed and everything goes away between runs.
Modified:
lldb/trunk/include/lldb/API/SBProcess.h
lldb/trunk/include/lldb/Core/ModuleList.h
lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h
lldb/trunk/source/API/SBProcess.cpp
lldb/trunk/source/Core/ModuleList.cpp
lldb/trunk/source/Interpreter/CommandInterpreter.cpp
Modified: lldb/trunk/include/lldb/API/SBProcess.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBProcess.h?rev=160140&r1=160139&r2=160140&view=diff
==============================================================================
--- lldb/trunk/include/lldb/API/SBProcess.h (original)
+++ lldb/trunk/include/lldb/API/SBProcess.h Thu Jul 12 15:32:19 2012
@@ -216,7 +216,7 @@
void
SetSP (const lldb::ProcessSP &process_sp);
- lldb::ProcessSP m_opaque_sp;
+ lldb::ProcessWP m_opaque_wp;
};
} // namespace lldb
Modified: lldb/trunk/include/lldb/Core/ModuleList.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ModuleList.h?rev=160140&r1=160139&r2=160140&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ModuleList.h (original)
+++ lldb/trunk/include/lldb/Core/ModuleList.h Thu Jul 12 15:32:19 2012
@@ -75,6 +75,19 @@
void
Append (const lldb::ModuleSP &module_sp);
+ //------------------------------------------------------------------
+ /// Append a module to the module list and remove any equivalent
+ /// modules. Equivalent modules are ones whose file, platform file
+ /// and architecture matches.
+ ///
+ /// Replaces the module to the collection.
+ ///
+ /// @param[in] module_sp
+ /// A shared pointer to a module to replace in this collection.
+ //------------------------------------------------------------------
+ void
+ ReplaceEquivalent (const lldb::ModuleSP &module_sp);
+
bool
AppendIfNeeded (const lldb::ModuleSP &module_sp);
Modified: lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h?rev=160140&r1=160139&r2=160140&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h (original)
+++ lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h Thu Jul 12 15:32:19 2012
@@ -296,10 +296,10 @@
return m_debugger;
}
- ExecutionContext &
+ ExecutionContext
GetExecutionContext()
{
- return m_exe_ctx;
+ return m_exe_ctx_ref.Lock();
}
void
@@ -464,7 +464,7 @@
PreprocessCommand (std::string &command);
Debugger &m_debugger; // The debugger session that this interpreter is associated with
- ExecutionContext m_exe_ctx; // The current execution context to use when handling commands
+ ExecutionContextRef m_exe_ctx_ref; // The current execution context to use when handling commands
bool m_synchronous_execution;
bool m_skip_lldbinit_files;
bool m_skip_app_init_files;
Modified: lldb/trunk/source/API/SBProcess.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBProcess.cpp?rev=160140&r1=160139&r2=160140&view=diff
==============================================================================
--- lldb/trunk/source/API/SBProcess.cpp (original)
+++ lldb/trunk/source/API/SBProcess.cpp Thu Jul 12 15:32:19 2012
@@ -39,7 +39,7 @@
SBProcess::SBProcess () :
- m_opaque_sp()
+ m_opaque_wp()
{
}
@@ -49,13 +49,13 @@
//----------------------------------------------------------------------
SBProcess::SBProcess (const SBProcess& rhs) :
- m_opaque_sp (rhs.m_opaque_sp)
+ m_opaque_wp (rhs.m_opaque_wp)
{
}
SBProcess::SBProcess (const lldb::ProcessSP &process_sp) :
- m_opaque_sp (process_sp)
+ m_opaque_wp (process_sp)
{
}
@@ -63,7 +63,7 @@
SBProcess::operator = (const SBProcess& rhs)
{
if (this != &rhs)
- m_opaque_sp = rhs.m_opaque_sp;
+ m_opaque_wp = rhs.m_opaque_wp;
return *this;
}
@@ -83,26 +83,26 @@
lldb::ProcessSP
SBProcess::GetSP() const
{
- return m_opaque_sp;
+ return m_opaque_wp.lock();
}
void
SBProcess::SetSP (const ProcessSP &process_sp)
{
- m_opaque_sp = process_sp;
+ m_opaque_wp = process_sp;
}
void
SBProcess::Clear ()
{
- m_opaque_sp.reset();
+ m_opaque_wp.reset();
}
bool
SBProcess::IsValid() const
{
- return m_opaque_sp.get() != NULL;
+ return m_opaque_wp.lock().get() != NULL;
}
bool
@@ -119,7 +119,7 @@
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
if (log) {
log->Printf ("SBProcess(%p)::RemoteLaunch (argv=%p, envp=%p, stdin=%s, stdout=%s, stderr=%s, working-dir=%s, launch_flags=0x%x, stop_at_entry=%i, &error (%p))...",
- m_opaque_sp.get(),
+ m_opaque_wp.lock().get(),
argv,
envp,
stdin_path ? stdin_path : "NULL",
Modified: lldb/trunk/source/Core/ModuleList.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ModuleList.cpp?rev=160140&r1=160139&r2=160140&view=diff
==============================================================================
--- lldb/trunk/source/Core/ModuleList.cpp (original)
+++ lldb/trunk/source/Core/ModuleList.cpp Thu Jul 12 15:32:19 2012
@@ -77,6 +77,32 @@
}
}
+void
+ModuleList::ReplaceEquivalent (const ModuleSP &module_sp)
+{
+ if (module_sp)
+ {
+ Mutex::Locker locker(m_modules_mutex);
+
+ // First remove any equivalent modules. Equivalent modules are modules
+ // whose path, platform path and architecture match.
+ ModuleSpec equivalent_module_spec (module_sp->GetFileSpec(), module_sp->GetArchitecture());
+ equivalent_module_spec.GetPlatformFileSpec() = module_sp->GetPlatformFileSpec();
+
+ size_t idx = 0;
+ while (idx < m_modules.size())
+ {
+ ModuleSP module_sp (m_modules[idx]);
+ if (module_sp->MatchesModuleSpec (equivalent_module_spec))
+ m_modules.erase(m_modules.begin() + idx);
+ else
+ ++idx;
+ }
+ // Now add the new module to the list
+ m_modules.push_back(module_sp);
+ }
+}
+
bool
ModuleList::AppendIfNeeded (const ModuleSP &module_sp)
{
@@ -323,7 +349,7 @@
return sc_list.GetSize() - initial_size;
}
- size_t
+size_t
ModuleList::FindSymbolsMatchingRegExAndType (const RegularExpression ®ex,
lldb::SymbolType symbol_type,
SymbolContextList &sc_list,
@@ -727,7 +753,7 @@
if (did_create_ptr)
*did_create_ptr = true;
- shared_module_list.Append(module_sp);
+ shared_module_list.ReplaceEquivalent(module_sp);
return error;
}
}
@@ -819,7 +845,7 @@
if (did_create_ptr)
*did_create_ptr = true;
- shared_module_list.Append(module_sp);
+ shared_module_list.ReplaceEquivalent(module_sp);
}
else
{
Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=160140&r1=160139&r2=160140&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Thu Jul 12 15:32:19 2012
@@ -1143,7 +1143,8 @@
{
std::string expr_str (command, expr_content_start, end_backtick - expr_content_start);
- Target *target = m_exe_ctx.GetTargetPtr();
+ ExecutionContext exe_ctx(GetExecutionContext());
+ Target *target = exe_ctx.GetTargetPtr();
// Get a dummy target to allow for calculator mode while processing backticks.
// This also helps break the infinite loop caused when target is null.
if (!target)
@@ -1155,7 +1156,7 @@
const bool keep_in_memory = false;
ValueObjectSP expr_result_valobj_sp;
ExecutionResults expr_result = target->EvaluateExpression (expr_str.c_str(),
- m_exe_ctx.GetFramePtr(),
+ exe_ctx.GetFramePtr(),
eExecutionPolicyOnlyWhenNeeded,
coerce_to_id,
unwind_on_error,
@@ -2228,7 +2229,8 @@
PlatformSP platform_sp;
if (prefer_target_platform)
{
- Target *target = m_exe_ctx.GetTargetPtr();
+ ExecutionContext exe_ctx(GetExecutionContext());
+ Target *target = exe_ctx.GetTargetPtr();
if (target)
platform_sp = target->GetPlatform();
}
@@ -2618,39 +2620,14 @@
void
CommandInterpreter::UpdateExecutionContext (ExecutionContext *override_context)
{
- m_exe_ctx.Clear();
-
if (override_context != NULL)
{
- m_exe_ctx = *override_context;
+ m_exe_ctx_ref = *override_context;
}
else
{
- TargetSP target_sp (m_debugger.GetSelectedTarget());
- if (target_sp)
- {
- m_exe_ctx.SetTargetSP (target_sp);
- ProcessSP process_sp (target_sp->GetProcessSP());
- m_exe_ctx.SetProcessSP (process_sp);
- if (process_sp && process_sp->IsAlive() && !process_sp->IsRunning())
- {
- ThreadSP thread_sp (process_sp->GetThreadList().GetSelectedThread());
- if (thread_sp)
- {
- m_exe_ctx.SetThreadSP (thread_sp);
- StackFrameSP frame_sp (thread_sp->GetSelectedFrame());
- if (!frame_sp)
- {
- frame_sp = thread_sp->GetStackFrameAtIndex (0);
- // If we didn't have a selected frame select one here.
- if (frame_sp)
- thread_sp->SetSelectedFrame(frame_sp.get());
- }
- if (frame_sp)
- m_exe_ctx.SetFrameSP (frame_sp);
- }
- }
- }
+ const bool adopt_selected = true;
+ m_exe_ctx_ref.SetTargetPtr (m_debugger.GetSelectedTarget().get(), adopt_selected);
}
}
More information about the lldb-commits
mailing list