diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-02-25 19:07:48 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-02-25 19:07:48 +0000 |
| commit | c96e529e3b6d0efa504985bf5a6db1ac5e958fdf (patch) | |
| tree | 916b8e5827dd34e57b7f0dfc8006480ecfb2f430 /source | |
| parent | 012155a8760772089d507063b47b7f4c911a782b (diff) | |
Vendor import of lldb release_80 branch r354799:vendor/lldb/lldb-release_800-r356365vendor/lldb/lldb-release_80-r356034vendor/lldb/lldb-release_80-r355677vendor/lldb/lldb-release_80-r355313vendor/lldb/lldb-release_80-r354799
Notes
svn path=/vendor/lldb/dist-release_80/; revision=344545
svn path=/vendor/lldb/lldb-release_800-r356365/; revision=345342; tag=vendor/lldb/lldb-release_800-r356365
Diffstat (limited to 'source')
| -rw-r--r-- | source/Host/common/MainLoop.cpp | 10 | ||||
| -rw-r--r-- | source/Host/openbsd/Host.cpp | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/source/Host/common/MainLoop.cpp b/source/Host/common/MainLoop.cpp index 39c353e6717e..337ddd51dd6b 100644 --- a/source/Host/common/MainLoop.cpp +++ b/source/Host/common/MainLoop.cpp @@ -108,8 +108,14 @@ Status MainLoop::RunImpl::Poll() { num_events = kevent(loop.m_kqueue, in_events.data(), in_events.size(), out_events, llvm::array_lengthof(out_events), nullptr); - if (num_events < 0) - return Status("kevent() failed with error %d\n", num_events); + if (num_events < 0) { + if (errno == EINTR) { + // in case of EINTR, let the main loop run one iteration + // we need to zero num_events to avoid assertions failing + num_events = 0; + } else + return Status(errno, eErrorTypePOSIX); + } return Status(); } diff --git a/source/Host/openbsd/Host.cpp b/source/Host/openbsd/Host.cpp index cba1f4ee6b7c..8db0498d14b5 100644 --- a/source/Host/openbsd/Host.cpp +++ b/source/Host/openbsd/Host.cpp @@ -68,8 +68,7 @@ GetOpenBSDProcessArgs(const ProcessInstanceInfoMatch *match_info_ptr, cstr = data.GetCStr(&offset); if (cstr) { - process_info.GetExecutableFile().SetFile(cstr, false, - FileSpec::Style::native); + process_info.GetExecutableFile().SetFile(cstr, FileSpec::Style::native); if (!(match_info_ptr == NULL || NameMatches( |