Index: runtime/bin/dbg_connection_android.cc |
diff --git a/runtime/bin/dbg_connection_android.cc b/runtime/bin/dbg_connection_android.cc |
index 92fb7ca5b3787d92ea03ecb784eb96a13de7de9e..35154a365279ee222b834287abcc60673487f8bd 100644 |
--- a/runtime/bin/dbg_connection_android.cc |
+++ b/runtime/bin/dbg_connection_android.cc |
@@ -15,6 +15,8 @@ |
#include "bin/log.h" |
#include "bin/socket.h" |
+#include "platform/signal_blocker.h" |
+ |
namespace dart { |
namespace bin { |
@@ -69,14 +71,14 @@ void DebuggerConnectionImpl::Handler(uword args) { |
void DebuggerConnectionImpl::SetupPollQueue() { |
- int result = TEMP_FAILURE_RETRY(pipe(wakeup_fds_)); |
+ int result = NO_RETRY_EXPECTED(pipe(wakeup_fds_)); |
if (result != 0) { |
FATAL1("Pipe creation failed with error %d\n", result); |
} |
FDUtils::SetNonBlocking(wakeup_fds_[0]); |
static const int kEpollInitialSize = 16; |
- epoll_fd_ = TEMP_FAILURE_RETRY(epoll_create(kEpollInitialSize)); |
+ epoll_fd_ = NO_RETRY_EXPECTED(epoll_create(kEpollInitialSize)); |
if (epoll_fd_ == -1) { |
FATAL("Failed creating epoll file descriptor"); |
} |
@@ -85,7 +87,7 @@ void DebuggerConnectionImpl::SetupPollQueue() { |
struct epoll_event event; |
event.events = EPOLLIN; |
event.data.fd = wakeup_fds_[0]; |
- int status = TEMP_FAILURE_RETRY(epoll_ctl( |
+ int status = NO_RETRY_EXPECTED(epoll_ctl( |
epoll_fd_, EPOLL_CTL_ADD, wakeup_fds_[0], &event)); |
if (status == -1) { |
FATAL("Failed adding wakeup fd to epoll instance"); |
@@ -94,7 +96,7 @@ void DebuggerConnectionImpl::SetupPollQueue() { |
// Register the listener_fd with the epoll instance. |
event.events = EPOLLIN; |
event.data.fd = DebuggerConnectionHandler::listener_fd_; |
- status = TEMP_FAILURE_RETRY(epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, |
+ status = NO_RETRY_EXPECTED(epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, |
DebuggerConnectionHandler::listener_fd_, &event)); |
if (status == -1) { |
FATAL("Failed adding listener fd to epoll instance"); |