Chromium Code Reviews| Index: runtime/bin/dbg_connection_linux.cc |
| diff --git a/runtime/bin/dbg_connection_linux.cc b/runtime/bin/dbg_connection_linux.cc |
| index 020b8cb7b2585272d7fef932b03c6c2277598920..5cb0e61d1fa6cb1d37a1dfbd3dc09e8e98b25dfc 100644 |
| --- a/runtime/bin/dbg_connection_linux.cc |
| +++ b/runtime/bin/dbg_connection_linux.cc |
| @@ -10,6 +10,7 @@ |
| #include <stdlib.h> // NOLINT |
| #include <sys/epoll.h> // NOLINT |
| +#include "platform/signal_blocker.h" |
| #include "bin/dbg_connection.h" |
| #include "bin/fdutils.h" |
| #include "bin/log.h" |
| @@ -69,14 +70,14 @@ void DebuggerConnectionImpl::Handler(uword args) { |
| void DebuggerConnectionImpl::SetupPollQueue() { |
| - int result = TEMP_FAILURE_RETRY(pipe(wakeup_fds_)); |
| + int result = pipe(wakeup_fds_); |
|
Søren Gjesse
2014/02/20 15:09:09
Should we add a NO_RETRY_EXPECTED macro to sanity-
Anders Johnsen
2014/02/20 15:10:17
Good idea - will into that tomorrow.
Cutch
2014/02/20 15:20:01
+1
|
| 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_ = epoll_create(kEpollInitialSize); |
| if (epoll_fd_ == -1) { |
| FATAL("Failed creating epoll file descriptor"); |
| } |
| @@ -85,8 +86,7 @@ void DebuggerConnectionImpl::SetupPollQueue() { |
| struct epoll_event event; |
| event.events = EPOLLIN; |
| event.data.fd = wakeup_fds_[0]; |
| - int status = TEMP_FAILURE_RETRY(epoll_ctl( |
| - epoll_fd_, EPOLL_CTL_ADD, wakeup_fds_[0], &event)); |
| + int status = epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, wakeup_fds_[0], &event); |
| if (status == -1) { |
| FATAL("Failed adding wakeup fd to epoll instance"); |
| } |
| @@ -94,8 +94,8 @@ 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, |
| - DebuggerConnectionHandler::listener_fd_, &event)); |
| + status = epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, |
| + DebuggerConnectionHandler::listener_fd_, &event); |
| if (status == -1) { |
| FATAL("Failed adding listener fd to epoll instance"); |
| } |