From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: =?UTF-8?q?***=20This=20commit=20represents=20a=20complete=20refor?= =?UTF-8?q?matting=20of=20the=20LLDB=20source=20code=20***=20to=20conform?= =?UTF-8?q?=20to=20clang-format=E2=80=99s=20LLVM=20style.=20=20This=20kind?= =?UTF-8?q?=20of=20mass=20change=20has=20***=20two=20obvious=20implication?= =?UTF-8?q?s:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Firstly, merging this particular commit into a downstream fork may be a huge effort. Alternatively, it may be worth merging all changes up to this commit, performing the same reformatting operation locally, and then discarding the merge for this particular commit. The commands used to accomplish this reformatting were as follows (with current working directory as the root of the repository): find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} + find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ; The version of clang-format used was 3.9.0, and autopep8 was 1.2.4. Secondly, “blame” style tools will generally point to this commit instead of a meaningful prior commit. There are alternatives available that will attempt to look through this change and find the appropriate prior commit. YMMV. llvm-svn: 280751 --- lldb/source/Target/ThreadCollection.cpp | 90 ++++++++++++++------------------- 1 file changed, 37 insertions(+), 53 deletions(-) (limited to 'lldb/source/Target/ThreadCollection.cpp') diff --git a/lldb/source/Target/ThreadCollection.cpp b/lldb/source/Target/ThreadCollection.cpp index d8d622e..2d63b67 100644 --- a/lldb/source/Target/ThreadCollection.cpp +++ b/lldb/source/Target/ThreadCollection.cpp @@ -11,72 +11,56 @@ #include #include -#include "lldb/Target/ThreadCollection.h" #include "lldb/Target/Thread.h" +#include "lldb/Target/ThreadCollection.h" using namespace lldb; using namespace lldb_private; -ThreadCollection::ThreadCollection() : - m_threads(), - m_mutex() -{ -} +ThreadCollection::ThreadCollection() : m_threads(), m_mutex() {} -ThreadCollection::ThreadCollection(collection threads) : - m_threads(threads), - m_mutex() -{ -} +ThreadCollection::ThreadCollection(collection threads) + : m_threads(threads), m_mutex() {} -void -ThreadCollection::AddThread (const ThreadSP &thread_sp) -{ - std::lock_guard guard(GetMutex()); - m_threads.push_back (thread_sp); +void ThreadCollection::AddThread(const ThreadSP &thread_sp) { + std::lock_guard guard(GetMutex()); + m_threads.push_back(thread_sp); } -void -ThreadCollection::AddThreadSortedByIndexID (const ThreadSP &thread_sp) -{ - std::lock_guard guard(GetMutex()); - // Make sure we always keep the threads sorted by thread index ID - const uint32_t thread_index_id = thread_sp->GetIndexID(); - if (m_threads.empty() || m_threads.back()->GetIndexID() < thread_index_id) - m_threads.push_back (thread_sp); - else - { - m_threads.insert(std::upper_bound(m_threads.begin(), m_threads.end(), thread_sp, - [] (const ThreadSP &lhs, const ThreadSP &rhs) -> bool - { - return lhs->GetIndexID() < rhs->GetIndexID(); - }), thread_sp); - } +void ThreadCollection::AddThreadSortedByIndexID(const ThreadSP &thread_sp) { + std::lock_guard guard(GetMutex()); + // Make sure we always keep the threads sorted by thread index ID + const uint32_t thread_index_id = thread_sp->GetIndexID(); + if (m_threads.empty() || m_threads.back()->GetIndexID() < thread_index_id) + m_threads.push_back(thread_sp); + else { + m_threads.insert( + std::upper_bound(m_threads.begin(), m_threads.end(), thread_sp, + [](const ThreadSP &lhs, const ThreadSP &rhs) -> bool { + return lhs->GetIndexID() < rhs->GetIndexID(); + }), + thread_sp); + } } -void -ThreadCollection::InsertThread (const lldb::ThreadSP &thread_sp, uint32_t idx) -{ - std::lock_guard guard(GetMutex()); - if (idx < m_threads.size()) - m_threads.insert(m_threads.begin() + idx, thread_sp); - else - m_threads.push_back (thread_sp); +void ThreadCollection::InsertThread(const lldb::ThreadSP &thread_sp, + uint32_t idx) { + std::lock_guard guard(GetMutex()); + if (idx < m_threads.size()) + m_threads.insert(m_threads.begin() + idx, thread_sp); + else + m_threads.push_back(thread_sp); } -uint32_t -ThreadCollection::GetSize () -{ - std::lock_guard guard(GetMutex()); - return m_threads.size(); +uint32_t ThreadCollection::GetSize() { + std::lock_guard guard(GetMutex()); + return m_threads.size(); } -ThreadSP -ThreadCollection::GetThreadAtIndex (uint32_t idx) -{ - std::lock_guard guard(GetMutex()); - ThreadSP thread_sp; - if (idx < m_threads.size()) - thread_sp = m_threads[idx]; - return thread_sp; +ThreadSP ThreadCollection::GetThreadAtIndex(uint32_t idx) { + std::lock_guard guard(GetMutex()); + ThreadSP thread_sp; + if (idx < m_threads.size()) + thread_sp = m_threads[idx]; + return thread_sp; } -- cgit v1.1