From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: *** This commit represents a complete reformatting of the LLDB source code *** to conform to clang-format’s LLVM style. This kind of mass change has *** two obvious implications: 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/ThreadSpec.cpp | 193 ++++++++++++++++---------------------- 1 file changed, 79 insertions(+), 114 deletions(-) (limited to 'lldb/source/Target/ThreadSpec.cpp') diff --git a/lldb/source/Target/ThreadSpec.cpp b/lldb/source/Target/ThreadSpec.cpp index f877f521bd5..1d217e00035 100644 --- a/lldb/source/Target/ThreadSpec.cpp +++ b/lldb/source/Target/ThreadSpec.cpp @@ -17,142 +17,107 @@ using namespace lldb; using namespace lldb_private; -ThreadSpec::ThreadSpec() : - m_index (UINT32_MAX), - m_tid (LLDB_INVALID_THREAD_ID), - m_name(), - m_queue_name () -{ -} +ThreadSpec::ThreadSpec() + : m_index(UINT32_MAX), m_tid(LLDB_INVALID_THREAD_ID), m_name(), + m_queue_name() {} -ThreadSpec::ThreadSpec(const ThreadSpec &rhs) : - m_index(rhs.m_index), - m_tid(rhs.m_tid), - m_name(rhs.m_name), - m_queue_name(rhs.m_queue_name) -{ -} +ThreadSpec::ThreadSpec(const ThreadSpec &rhs) + : m_index(rhs.m_index), m_tid(rhs.m_tid), m_name(rhs.m_name), + m_queue_name(rhs.m_queue_name) {} -const ThreadSpec & -ThreadSpec::operator=(const ThreadSpec &rhs) -{ - m_index = rhs.m_index; - m_tid = rhs.m_tid; - m_name = rhs.m_name; - m_queue_name = rhs.m_queue_name; - return *this; +const ThreadSpec &ThreadSpec::operator=(const ThreadSpec &rhs) { + m_index = rhs.m_index; + m_tid = rhs.m_tid; + m_name = rhs.m_name; + m_queue_name = rhs.m_queue_name; + return *this; } -const char * -ThreadSpec::GetName () const -{ - return m_name.empty() ? nullptr : m_name.c_str(); +const char *ThreadSpec::GetName() const { + return m_name.empty() ? nullptr : m_name.c_str(); } -const char * -ThreadSpec::GetQueueName () const -{ - return m_queue_name.empty() ? nullptr : m_queue_name.c_str(); +const char *ThreadSpec::GetQueueName() const { + return m_queue_name.empty() ? nullptr : m_queue_name.c_str(); } -bool -ThreadSpec::TIDMatches (Thread &thread) const -{ - if (m_tid == LLDB_INVALID_THREAD_ID) - return true; - - lldb::tid_t thread_id = thread.GetID(); - return TIDMatches (thread_id); +bool ThreadSpec::TIDMatches(Thread &thread) const { + if (m_tid == LLDB_INVALID_THREAD_ID) + return true; + + lldb::tid_t thread_id = thread.GetID(); + return TIDMatches(thread_id); } -bool -ThreadSpec::IndexMatches (Thread &thread) const -{ - if (m_index == UINT32_MAX) - return true; - uint32_t index = thread.GetIndexID(); - return IndexMatches (index); +bool ThreadSpec::IndexMatches(Thread &thread) const { + if (m_index == UINT32_MAX) + return true; + uint32_t index = thread.GetIndexID(); + return IndexMatches(index); } -bool -ThreadSpec::NameMatches (Thread &thread) const -{ - if (m_name.empty()) - return true; - - const char *name = thread.GetName(); - return NameMatches (name); +bool ThreadSpec::NameMatches(Thread &thread) const { + if (m_name.empty()) + return true; + + const char *name = thread.GetName(); + return NameMatches(name); } -bool -ThreadSpec::QueueNameMatches (Thread &thread) const -{ - if (m_queue_name.empty()) - return true; - - const char *queue_name = thread.GetQueueName(); - return QueueNameMatches (queue_name); +bool ThreadSpec::QueueNameMatches(Thread &thread) const { + if (m_queue_name.empty()) + return true; + + const char *queue_name = thread.GetQueueName(); + return QueueNameMatches(queue_name); } -bool -ThreadSpec::ThreadPassesBasicTests (Thread &thread) const -{ - if (!HasSpecification()) - return true; - - if (!TIDMatches(thread)) - return false; - - if (!IndexMatches(thread)) - return false; - - if (!NameMatches (thread)) - return false; - - if (!QueueNameMatches (thread)) - return false; - +bool ThreadSpec::ThreadPassesBasicTests(Thread &thread) const { + if (!HasSpecification()) return true; + + if (!TIDMatches(thread)) + return false; + + if (!IndexMatches(thread)) + return false; + + if (!NameMatches(thread)) + return false; + + if (!QueueNameMatches(thread)) + return false; + + return true; } -bool -ThreadSpec::HasSpecification() const -{ - return (m_index != UINT32_MAX || m_tid != LLDB_INVALID_THREAD_ID || !m_name.empty() || !m_queue_name.empty()); +bool ThreadSpec::HasSpecification() const { + return (m_index != UINT32_MAX || m_tid != LLDB_INVALID_THREAD_ID || + !m_name.empty() || !m_queue_name.empty()); } -void -ThreadSpec::GetDescription (Stream *s, lldb::DescriptionLevel level) const -{ - if (!HasSpecification()) - { - if (level == eDescriptionLevelBrief) - { - s->PutCString("thread spec: no "); - } +void ThreadSpec::GetDescription(Stream *s, lldb::DescriptionLevel level) const { + if (!HasSpecification()) { + if (level == eDescriptionLevelBrief) { + s->PutCString("thread spec: no "); } - else - { - if (level == eDescriptionLevelBrief) - { - s->PutCString("thread spec: yes "); - } - else - { - if (GetTID() != LLDB_INVALID_THREAD_ID) - s->Printf("tid: 0x%" PRIx64 " ", GetTID()); - - if (GetIndex() != UINT32_MAX) - s->Printf("index: %d ", GetIndex()); - - const char *name = GetName(); - if (name) - s->Printf ("thread name: \"%s\" ", name); - - const char *queue_name = GetQueueName(); - if (queue_name) - s->Printf ("queue name: \"%s\" ", queue_name); - } + } else { + if (level == eDescriptionLevelBrief) { + s->PutCString("thread spec: yes "); + } else { + if (GetTID() != LLDB_INVALID_THREAD_ID) + s->Printf("tid: 0x%" PRIx64 " ", GetTID()); + + if (GetIndex() != UINT32_MAX) + s->Printf("index: %d ", GetIndex()); + + const char *name = GetName(); + if (name) + s->Printf("thread name: \"%s\" ", name); + const char *queue_name = GetQueueName(); + if (queue_name) + s->Printf("queue name: \"%s\" ", queue_name); } + } } -- cgit v1.2.3