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/Host/windows/ProcessRunLock.cpp | 115 +++++++++++----------------- 1 file changed, 46 insertions(+), 69 deletions(-) (limited to 'lldb/source/Host/windows/ProcessRunLock.cpp') diff --git a/lldb/source/Host/windows/ProcessRunLock.cpp b/lldb/source/Host/windows/ProcessRunLock.cpp index 1f21552..590007b 100644 --- a/lldb/source/Host/windows/ProcessRunLock.cpp +++ b/lldb/source/Host/windows/ProcessRunLock.cpp @@ -1,106 +1,83 @@ #include "lldb/Host/ProcessRunLock.h" #include "lldb/Host/windows/windows.h" -namespace -{ +namespace { #if defined(__MINGW32__) // Taken from WinNT.h -typedef struct _RTL_SRWLOCK { - PVOID Ptr; -} RTL_SRWLOCK, *PRTL_SRWLOCK; +typedef struct _RTL_SRWLOCK { PVOID Ptr; } RTL_SRWLOCK, *PRTL_SRWLOCK; // Taken from WinBase.h typedef RTL_SRWLOCK SRWLOCK, *PSRWLOCK; #endif } - -static PSRWLOCK GetLock(lldb::rwlock_t lock) -{ - return static_cast(lock); +static PSRWLOCK GetLock(lldb::rwlock_t lock) { + return static_cast(lock); } -static bool ReadLock(lldb::rwlock_t rwlock) -{ - ::AcquireSRWLockShared(GetLock(rwlock)); - return true; +static bool ReadLock(lldb::rwlock_t rwlock) { + ::AcquireSRWLockShared(GetLock(rwlock)); + return true; } -static bool ReadUnlock(lldb::rwlock_t rwlock) -{ - ::ReleaseSRWLockShared(GetLock(rwlock)); - return true; +static bool ReadUnlock(lldb::rwlock_t rwlock) { + ::ReleaseSRWLockShared(GetLock(rwlock)); + return true; } -static bool WriteLock(lldb::rwlock_t rwlock) -{ - ::AcquireSRWLockExclusive(GetLock(rwlock)); - return true; +static bool WriteLock(lldb::rwlock_t rwlock) { + ::AcquireSRWLockExclusive(GetLock(rwlock)); + return true; } -static bool WriteTryLock(lldb::rwlock_t rwlock) -{ - return !!::TryAcquireSRWLockExclusive(GetLock(rwlock)); +static bool WriteTryLock(lldb::rwlock_t rwlock) { + return !!::TryAcquireSRWLockExclusive(GetLock(rwlock)); } -static bool WriteUnlock(lldb::rwlock_t rwlock) -{ - ::ReleaseSRWLockExclusive(GetLock(rwlock)); - return true; +static bool WriteUnlock(lldb::rwlock_t rwlock) { + ::ReleaseSRWLockExclusive(GetLock(rwlock)); + return true; } using namespace lldb_private; -ProcessRunLock::ProcessRunLock() - : m_running(false) -{ - m_rwlock = new SRWLOCK; - InitializeSRWLock(GetLock(m_rwlock)); +ProcessRunLock::ProcessRunLock() : m_running(false) { + m_rwlock = new SRWLOCK; + InitializeSRWLock(GetLock(m_rwlock)); } -ProcessRunLock::~ProcessRunLock() -{ - delete m_rwlock; -} +ProcessRunLock::~ProcessRunLock() { delete m_rwlock; } -bool ProcessRunLock::ReadTryLock() -{ - ::ReadLock(m_rwlock); - if (m_running == false) - return true; - ::ReadUnlock(m_rwlock); - return false; +bool ProcessRunLock::ReadTryLock() { + ::ReadLock(m_rwlock); + if (m_running == false) + return true; + ::ReadUnlock(m_rwlock); + return false; } -bool ProcessRunLock::ReadUnlock() -{ - return ::ReadUnlock(m_rwlock); +bool ProcessRunLock::ReadUnlock() { return ::ReadUnlock(m_rwlock); } + +bool ProcessRunLock::SetRunning() { + WriteLock(m_rwlock); + m_running = true; + WriteUnlock(m_rwlock); + return true; } -bool ProcessRunLock::SetRunning () -{ - WriteLock(m_rwlock); +bool ProcessRunLock::TrySetRunning() { + if (WriteTryLock(m_rwlock)) { + bool was_running = m_running; m_running = true; WriteUnlock(m_rwlock); - return true; -} - -bool ProcessRunLock::TrySetRunning () -{ - if (WriteTryLock(m_rwlock)) - { - bool was_running = m_running; - m_running = true; - WriteUnlock(m_rwlock); - return !was_running; - } - return false; + return !was_running; + } + return false; } -bool ProcessRunLock::SetStopped () -{ - WriteLock(m_rwlock); - m_running = false; - WriteUnlock(m_rwlock); - return true; +bool ProcessRunLock::SetStopped() { + WriteLock(m_rwlock); + m_running = false; + WriteUnlock(m_rwlock); + return true; } -- cgit v1.1