[Lldb-commits] [lldb] r179329 - <rdar://problem/13370286>
Greg Clayton
gclayton at apple.com
Thu Apr 11 15:26:47 PDT 2013
Author: gclayton
Date: Thu Apr 11 17:26:47 2013
New Revision: 179329
URL: http://llvm.org/viewvc/llvm-project?rev=179329&view=rev
Log:
<rdar://problem/13370286>
Fixed a case there the OperatingSystemPython would try to access and play with SBValue objects when the process' public run lock was taken. Prior to this fix, all attempts to run any SBValue functions would fail if run from the private state thread (like updating the thread list). Now we have two run locks, one for public (all threads except the private state thread) and one for private.
Modified:
lldb/trunk/include/lldb/Target/Process.h
lldb/trunk/source/Target/Process.cpp
Modified: lldb/trunk/include/lldb/Target/Process.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Process.h?rev=179329&r1=179328&r2=179329&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/Process.h (original)
+++ lldb/trunk/include/lldb/Target/Process.h Thu Apr 11 17:26:47 2013
@@ -3457,7 +3457,10 @@ public:
ReadWriteLock &
GetRunLock ()
{
- return m_run_lock;
+ if (Host::GetCurrentThread() == m_private_state_thread)
+ return m_private_run_lock;
+ else
+ return m_public_run_lock;
}
protected:
@@ -3596,7 +3599,8 @@ protected:
LanguageRuntimeCollection m_language_runtimes;
std::auto_ptr<NextEventAction> m_next_event_action_ap;
std::vector<PreResumeCallbackAndBaton> m_pre_resume_actions;
- ReadWriteLock m_run_lock;
+ ReadWriteLock m_public_run_lock;
+ ReadWriteLock m_private_run_lock;
Predicate<bool> m_currently_handling_event;
bool m_finalize_called;
lldb::StateType m_last_broadcast_state; /// This helps with the Public event coalescing in ShouldBroadcastEvent.
Modified: lldb/trunk/source/Target/Process.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Process.cpp?rev=179329&r1=179328&r2=179329&view=diff
==============================================================================
--- lldb/trunk/source/Target/Process.cpp (original)
+++ lldb/trunk/source/Target/Process.cpp Thu Apr 11 17:26:47 2013
@@ -1019,7 +1019,8 @@ Process::Process(Target &target, Listene
m_allocated_memory_cache (*this),
m_should_detach (false),
m_next_event_action_ap(),
- m_run_lock (),
+ m_public_run_lock (),
+ m_private_run_lock (),
m_currently_handling_event(false),
m_finalize_called(false),
m_last_broadcast_state (eStateInvalid),
@@ -1138,6 +1139,8 @@ Process::Finalize()
// contain events that have ProcessSP values in them which can keep this
// process around forever. These events need to be cleared out.
m_private_state_listener.Clear();
+ m_public_run_lock.WriteUnlock();
+ m_private_run_lock.WriteUnlock();
m_finalize_called = true;
}
@@ -1610,7 +1613,7 @@ Process::SetPublicState (StateType new_s
{
if (log)
log->Printf("Process::SetPublicState (%s) -- unlocking run lock for detach", StateAsCString(new_state));
- m_run_lock.WriteUnlock();
+ m_public_run_lock.WriteUnlock();
}
else
{
@@ -1622,7 +1625,7 @@ Process::SetPublicState (StateType new_s
{
if (log)
log->Printf("Process::SetPublicState (%s) -- unlocking run lock", StateAsCString(new_state));
- m_run_lock.WriteUnlock();
+ m_public_run_lock.WriteUnlock();
}
}
}
@@ -1635,7 +1638,7 @@ Process::Resume ()
Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STATE | LIBLLDB_LOG_PROCESS));
if (log)
log->Printf("Process::Resume -- locking run lock");
- if (!m_run_lock.WriteTryLock())
+ if (!m_public_run_lock.WriteTryLock())
{
Error error("Resume request failed - process still running.");
if (log)
@@ -2757,7 +2760,7 @@ Process::Launch (const ProcessLaunchInfo
SetPublicState (eStateLaunching);
m_should_detach = false;
- if (m_run_lock.WriteTryLock())
+ if (m_public_run_lock.WriteTryLock())
{
// Now launch using these arguments.
error = DoLaunch (exe_module, launch_info);
@@ -2941,7 +2944,7 @@ Process::Attach (ProcessAttachInfo &atta
error = WillAttachToProcessWithName(process_name, wait_for_launch);
if (error.Success())
{
- if (m_run_lock.WriteTryLock())
+ if (m_public_run_lock.WriteTryLock())
{
m_should_detach = true;
SetPublicState (eStateAttaching);
@@ -3018,7 +3021,7 @@ Process::Attach (ProcessAttachInfo &atta
if (error.Success())
{
- if (m_run_lock.WriteTryLock())
+ if (m_public_run_lock.WriteTryLock())
{
// Now attach using these arguments.
m_should_detach = true;
@@ -3186,6 +3189,7 @@ Process::PrivateResume ()
else
{
m_mod_id.BumpResumeID();
+ m_private_run_lock.WriteLock();
error = DoResume();
if (error.Success())
{
@@ -3194,6 +3198,10 @@ Process::PrivateResume ()
if (log)
log->Printf ("Process thinks the process has resumed.");
}
+ else
+ {
+ m_private_run_lock.WriteUnlock();
+ }
}
}
else
@@ -3401,7 +3409,7 @@ Process::Detach ()
// the last events through the event system, in which case we might strand the write lock. Unlock
// it here so when we do to tear down the process we don't get an error destroying the lock.
- m_run_lock.WriteUnlock();
+ m_public_run_lock.WriteUnlock();
return error;
}
@@ -3459,7 +3467,7 @@ Process::Destroy ()
// If we have been interrupted (to kill us) in the middle of running, we may not end up propagating
// the last events through the event system, in which case we might strand the write lock. Unlock
// it here so when we do to tear down the process we don't get an error destroying the lock.
- m_run_lock.WriteUnlock();
+ m_public_run_lock.WriteUnlock();
}
m_destroy_in_process = false;
@@ -3562,6 +3570,8 @@ Process::ShouldBroadcastEvent (Event *ev
// If we aren't going to stop, let the thread plans decide if we're going to report this event.
// If no thread has an opinion, we don't report it.
+ m_private_run_lock.WriteUnlock();
+
RefreshStateAfterStop ();
if (ProcessEventData::GetInterruptedFromEvent (event_ptr))
{
@@ -3925,6 +3935,7 @@ Process::RunPrivateStateThread ()
if (log)
log->Printf ("Process::%s (arg = %p, pid = %" PRIu64 ") thread exiting...", __FUNCTION__, this, GetID());
+ m_public_run_lock.WriteUnlock();
m_private_state_control_wait.SetValue (true, eBroadcastAlways);
m_private_state_thread = LLDB_INVALID_HOST_THREAD;
return NULL;
More information about the lldb-commits
mailing list