diff options
| author | Andrew Kaylor <andrew.kaylor@intel.com> | 2013-05-07 18:35:34 +0000 |
|---|---|---|
| committer | Andrew Kaylor <andrew.kaylor@intel.com> | 2013-05-07 18:35:34 +0000 |
| commit | ba4e61d3f5f8cfd30b5a359e18e7da98b3c465b8 (patch) | |
| tree | 93f7926f780675bf70802cd49e6ba24f5b9f2a2a /lldb/source/Plugins/OperatingSystem/Python | |
| parent | 6baa776173902eb3a1f4ffbc8f8cdfd06f7fe81a (diff) | |
| download | bcm5719-llvm-ba4e61d3f5f8cfd30b5a359e18e7da98b3c465b8.tar.gz bcm5719-llvm-ba4e61d3f5f8cfd30b5a359e18e7da98b3c465b8.zip | |
Reinstating r181091 and r181106 with fix for Linux regressions.
llvm-svn: 181340
Diffstat (limited to 'lldb/source/Plugins/OperatingSystem/Python')
| -rw-r--r-- | lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp | 6 | ||||
| -rw-r--r-- | lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp index fc05d6e18ec..0528033f3b1 100644 --- a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp +++ b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp @@ -171,7 +171,9 @@ OperatingSystemPython::GetPluginVersion() } bool -OperatingSystemPython::UpdateThreadList (ThreadList &old_thread_list, ThreadList &new_thread_list) +OperatingSystemPython::UpdateThreadList (ThreadList &old_thread_list, + ThreadList &core_thread_list, + ThreadList &new_thread_list) { if (!m_interpreter || !m_python_object_sp) return false; @@ -194,8 +196,6 @@ OperatingSystemPython::UpdateThreadList (ThreadList &old_thread_list, ThreadList PythonList threads_list(m_interpreter->OSPlugin_ThreadsInfo(m_python_object_sp)); if (threads_list) { - ThreadList core_thread_list(new_thread_list); - uint32_t i; const uint32_t num_threads = threads_list.GetSize(); for (i=0; i<num_threads; ++i) diff --git a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h index 756d054cca1..0055058192c 100644 --- a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h +++ b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h @@ -65,7 +65,8 @@ public: // lldb_private::OperatingSystem Methods //------------------------------------------------------------------ virtual bool - UpdateThreadList (lldb_private::ThreadList &old_thread_list, + UpdateThreadList (lldb_private::ThreadList &old_thread_list, + lldb_private::ThreadList &real_thread_list, lldb_private::ThreadList &new_thread_list); virtual void |
