diff options
author | Kate Stone <katherine.stone@apple.com> | 2016-09-06 20:57:50 +0000 |
---|---|---|
committer | Kate Stone <katherine.stone@apple.com> | 2016-09-06 20:57:50 +0000 |
commit | b9c1b51e45b845debb76d8658edabca70ca56079 (patch) | |
tree | dfcb5a13ef2b014202340f47036da383eaee74aa /lldb/source/Host/windows/HostProcessWindows.cpp | |
parent | d5aa73376966339caad04013510626ec2e42c760 (diff) | |
download | bcm5719-llvm-b9c1b51e45b845debb76d8658edabca70ca56079.tar.gz bcm5719-llvm-b9c1b51e45b845debb76d8658edabca70ca56079.zip |
*** 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:
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
Diffstat (limited to 'lldb/source/Host/windows/HostProcessWindows.cpp')
-rw-r--r-- | lldb/source/Host/windows/HostProcessWindows.cpp | 164 |
1 files changed, 71 insertions, 93 deletions
diff --git a/lldb/source/Host/windows/HostProcessWindows.cpp b/lldb/source/Host/windows/HostProcessWindows.cpp index 2878171cbe7..81c81a775df 100644 --- a/lldb/source/Host/windows/HostProcessWindows.cpp +++ b/lldb/source/Host/windows/HostProcessWindows.cpp @@ -7,11 +7,11 @@ // //===----------------------------------------------------------------------===// +#include "lldb/Host/windows/HostProcessWindows.h" #include "lldb/Host/FileSpec.h" #include "lldb/Host/HostThread.h" #include "lldb/Host/ThreadLauncher.h" #include "lldb/Host/windows/windows.h" -#include "lldb/Host/windows/HostProcessWindows.h" #include "llvm/ADT/STLExtras.h" #include "llvm/Support/ConvertUTF.h" @@ -20,123 +20,101 @@ using namespace lldb_private; -namespace -{ -struct MonitorInfo -{ - Host::MonitorChildProcessCallback callback; - HANDLE process_handle; +namespace { +struct MonitorInfo { + Host::MonitorChildProcessCallback callback; + HANDLE process_handle; }; } HostProcessWindows::HostProcessWindows() - : HostNativeProcessBase() - , m_owns_handle(true) -{ -} + : HostNativeProcessBase(), m_owns_handle(true) {} HostProcessWindows::HostProcessWindows(lldb::process_t process) - : HostNativeProcessBase(process) - , m_owns_handle(true) -{ -} + : HostNativeProcessBase(process), m_owns_handle(true) {} -HostProcessWindows::~HostProcessWindows() -{ - Close(); -} +HostProcessWindows::~HostProcessWindows() { Close(); } -void -HostProcessWindows::SetOwnsHandle(bool owns) -{ - m_owns_handle = owns; -} +void HostProcessWindows::SetOwnsHandle(bool owns) { m_owns_handle = owns; } -Error HostProcessWindows::Terminate() -{ - Error error; - if (m_process == nullptr) - error.SetError(ERROR_INVALID_HANDLE, lldb::eErrorTypeWin32); +Error HostProcessWindows::Terminate() { + Error error; + if (m_process == nullptr) + error.SetError(ERROR_INVALID_HANDLE, lldb::eErrorTypeWin32); - if (!::TerminateProcess(m_process, 0)) - error.SetError(::GetLastError(), lldb::eErrorTypeWin32); + if (!::TerminateProcess(m_process, 0)) + error.SetError(::GetLastError(), lldb::eErrorTypeWin32); - return error; + return error; } -Error HostProcessWindows::GetMainModule(FileSpec &file_spec) const -{ - Error error; - if (m_process == nullptr) - error.SetError(ERROR_INVALID_HANDLE, lldb::eErrorTypeWin32); - - std::vector<wchar_t> wpath(PATH_MAX); - if (::GetProcessImageFileNameW(m_process, wpath.data(), wpath.size())) - { - std::string path; - if (llvm::convertWideToUTF8(wpath.data(), path)) - file_spec.SetFile(path, false); - else - error.SetErrorString("Error converting path to UTF-8"); - } +Error HostProcessWindows::GetMainModule(FileSpec &file_spec) const { + Error error; + if (m_process == nullptr) + error.SetError(ERROR_INVALID_HANDLE, lldb::eErrorTypeWin32); + + std::vector<wchar_t> wpath(PATH_MAX); + if (::GetProcessImageFileNameW(m_process, wpath.data(), wpath.size())) { + std::string path; + if (llvm::convertWideToUTF8(wpath.data(), path)) + file_spec.SetFile(path, false); else - error.SetError(::GetLastError(), lldb::eErrorTypeWin32); + error.SetErrorString("Error converting path to UTF-8"); + } else + error.SetError(::GetLastError(), lldb::eErrorTypeWin32); - return error; + return error; } -lldb::pid_t HostProcessWindows::GetProcessId() const -{ - return (m_process == LLDB_INVALID_PROCESS) ? -1 : ::GetProcessId(m_process); +lldb::pid_t HostProcessWindows::GetProcessId() const { + return (m_process == LLDB_INVALID_PROCESS) ? -1 : ::GetProcessId(m_process); } -bool HostProcessWindows::IsRunning() const -{ - if (m_process == nullptr) - return false; +bool HostProcessWindows::IsRunning() const { + if (m_process == nullptr) + return false; - DWORD code = 0; - if (!::GetExitCodeProcess(m_process, &code)) - return false; + DWORD code = 0; + if (!::GetExitCodeProcess(m_process, &code)) + return false; - return (code == STILL_ACTIVE); + return (code == STILL_ACTIVE); } -HostThread -HostProcessWindows::StartMonitoring(const Host::MonitorChildProcessCallback &callback, bool monitor_signals) -{ - HostThread monitor_thread; - MonitorInfo *info = new MonitorInfo; - info->callback = callback; - - // Since the life of this HostProcessWindows instance and the life of the process may be different, duplicate the handle so that - // the monitor thread can have ownership over its own copy of the handle. - HostThread result; - if (::DuplicateHandle(GetCurrentProcess(), m_process, GetCurrentProcess(), &info->process_handle, 0, FALSE, DUPLICATE_SAME_ACCESS)) - result = ThreadLauncher::LaunchThread("ChildProcessMonitor", HostProcessWindows::MonitorThread, info, nullptr); - return result; +HostThread HostProcessWindows::StartMonitoring( + const Host::MonitorChildProcessCallback &callback, bool monitor_signals) { + HostThread monitor_thread; + MonitorInfo *info = new MonitorInfo; + info->callback = callback; + + // Since the life of this HostProcessWindows instance and the life of the + // process may be different, duplicate the handle so that + // the monitor thread can have ownership over its own copy of the handle. + HostThread result; + if (::DuplicateHandle(GetCurrentProcess(), m_process, GetCurrentProcess(), + &info->process_handle, 0, FALSE, DUPLICATE_SAME_ACCESS)) + result = ThreadLauncher::LaunchThread("ChildProcessMonitor", + HostProcessWindows::MonitorThread, + info, nullptr); + return result; } -lldb::thread_result_t -HostProcessWindows::MonitorThread(void *thread_arg) -{ - DWORD exit_code; - - MonitorInfo *info = static_cast<MonitorInfo *>(thread_arg); - if (info) - { - ::WaitForSingleObject(info->process_handle, INFINITE); - ::GetExitCodeProcess(info->process_handle, &exit_code); - info->callback(::GetProcessId(info->process_handle), true, 0, exit_code); - ::CloseHandle(info->process_handle); - delete (info); - } - return 0; +lldb::thread_result_t HostProcessWindows::MonitorThread(void *thread_arg) { + DWORD exit_code; + + MonitorInfo *info = static_cast<MonitorInfo *>(thread_arg); + if (info) { + ::WaitForSingleObject(info->process_handle, INFINITE); + ::GetExitCodeProcess(info->process_handle, &exit_code); + info->callback(::GetProcessId(info->process_handle), true, 0, exit_code); + ::CloseHandle(info->process_handle); + delete (info); + } + return 0; } -void HostProcessWindows::Close() -{ - if (m_owns_handle && m_process != LLDB_INVALID_PROCESS) - ::CloseHandle(m_process); - m_process = nullptr; +void HostProcessWindows::Close() { + if (m_owns_handle && m_process != LLDB_INVALID_PROCESS) + ::CloseHandle(m_process); + m_process = nullptr; } |