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/common/ThreadLauncher.cpp | 100 +++++++++++++++-------------- 1 file changed, 51 insertions(+), 49 deletions(-) (limited to 'lldb/source/Host/common/ThreadLauncher.cpp') diff --git a/lldb/source/Host/common/ThreadLauncher.cpp b/lldb/source/Host/common/ThreadLauncher.cpp index c19a233..b91c2fe 100644 --- a/lldb/source/Host/common/ThreadLauncher.cpp +++ b/lldb/source/Host/common/ThreadLauncher.cpp @@ -1,4 +1,5 @@ -//===-- ThreadLauncher.cpp ---------------------------------------*- C++ -*-===// +//===-- ThreadLauncher.cpp ---------------------------------------*- C++ +//-*-===// // // The LLVM Compiler Infrastructure // @@ -8,11 +9,11 @@ //===----------------------------------------------------------------------===// // lldb Includes +#include "lldb/Host/ThreadLauncher.h" #include "lldb/Core/Log.h" #include "lldb/Host/HostNativeThread.h" #include "lldb/Host/HostThread.h" #include "lldb/Host/ThisThread.h" -#include "lldb/Host/ThreadLauncher.h" #if defined(_WIN32) #include "lldb/Host/windows/windows.h" @@ -21,64 +22,65 @@ using namespace lldb; using namespace lldb_private; -HostThread -ThreadLauncher::LaunchThread(llvm::StringRef name, lldb::thread_func_t thread_function, lldb::thread_arg_t thread_arg, Error *error_ptr, size_t min_stack_byte_size) -{ - Error error; - if (error_ptr) - error_ptr->Clear(); +HostThread ThreadLauncher::LaunchThread(llvm::StringRef name, + lldb::thread_func_t thread_function, + lldb::thread_arg_t thread_arg, + Error *error_ptr, + size_t min_stack_byte_size) { + Error error; + if (error_ptr) + error_ptr->Clear(); - // Host::ThreadCreateTrampoline will delete this pointer for us. - HostThreadCreateInfo *info_ptr = new HostThreadCreateInfo(name.data(), thread_function, thread_arg); - lldb::thread_t thread; + // Host::ThreadCreateTrampoline will delete this pointer for us. + HostThreadCreateInfo *info_ptr = + new HostThreadCreateInfo(name.data(), thread_function, thread_arg); + lldb::thread_t thread; #ifdef _WIN32 - thread = - (lldb::thread_t)::_beginthreadex(0, (unsigned)min_stack_byte_size, HostNativeThread::ThreadCreateTrampoline, info_ptr, 0, NULL); - if (thread == (lldb::thread_t)(-1L)) - error.SetError(::GetLastError(), eErrorTypeWin32); + thread = (lldb::thread_t)::_beginthreadex( + 0, (unsigned)min_stack_byte_size, + HostNativeThread::ThreadCreateTrampoline, info_ptr, 0, NULL); + if (thread == (lldb::thread_t)(-1L)) + error.SetError(::GetLastError(), eErrorTypeWin32); #else - - // ASAN instrumentation adds a lot of bookkeeping overhead on stack frames. +// ASAN instrumentation adds a lot of bookkeeping overhead on stack frames. #if __has_feature(address_sanitizer) - const size_t eight_megabytes = 8 * 1024 * 1024; - if (min_stack_byte_size < eight_megabytes) - { - min_stack_byte_size += eight_megabytes; - } + const size_t eight_megabytes = 8 * 1024 * 1024; + if (min_stack_byte_size < eight_megabytes) { + min_stack_byte_size += eight_megabytes; + } #endif - pthread_attr_t *thread_attr_ptr = NULL; - pthread_attr_t thread_attr; - bool destroy_attr = false; - if (min_stack_byte_size > 0) - { - if (::pthread_attr_init (&thread_attr) == 0) - { - destroy_attr = true; - size_t default_min_stack_byte_size = 0; - if (::pthread_attr_getstacksize(&thread_attr, &default_min_stack_byte_size) == 0) - { - if (default_min_stack_byte_size < min_stack_byte_size) - { - if (::pthread_attr_setstacksize (&thread_attr, min_stack_byte_size) == 0) - thread_attr_ptr = &thread_attr; - } - } - + pthread_attr_t *thread_attr_ptr = NULL; + pthread_attr_t thread_attr; + bool destroy_attr = false; + if (min_stack_byte_size > 0) { + if (::pthread_attr_init(&thread_attr) == 0) { + destroy_attr = true; + size_t default_min_stack_byte_size = 0; + if (::pthread_attr_getstacksize(&thread_attr, + &default_min_stack_byte_size) == 0) { + if (default_min_stack_byte_size < min_stack_byte_size) { + if (::pthread_attr_setstacksize(&thread_attr, min_stack_byte_size) == + 0) + thread_attr_ptr = &thread_attr; } + } } - int err = ::pthread_create(&thread, thread_attr_ptr, HostNativeThread::ThreadCreateTrampoline, info_ptr); + } + int err = + ::pthread_create(&thread, thread_attr_ptr, + HostNativeThread::ThreadCreateTrampoline, info_ptr); - if (destroy_attr) - ::pthread_attr_destroy(&thread_attr); + if (destroy_attr) + ::pthread_attr_destroy(&thread_attr); - error.SetError(err, eErrorTypePOSIX); + error.SetError(err, eErrorTypePOSIX); #endif - if (error_ptr) - *error_ptr = error; - if (!error.Success()) - thread = LLDB_INVALID_HOST_THREAD; + if (error_ptr) + *error_ptr = error; + if (!error.Success()) + thread = LLDB_INVALID_HOST_THREAD; - return HostThread(thread); + return HostThread(thread); } -- cgit v1.1