From c96e529e3b6d0efa504985bf5a6db1ac5e958fdf Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Mon, 25 Feb 2019 19:07:48 +0000 Subject: Vendor import of lldb release_80 branch r354799: https://llvm.org/svn/llvm-project/lldb/branches/release_80@354799 --- source/Host/common/MainLoop.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'source/Host/common/MainLoop.cpp') 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(); } -- cgit v1.3