Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Unified Diff: runtime/bin/eventhandler_android.cc

Issue 2495003003: Adds some error handling to the socket implementation. (Closed)
Patch Set: Add perror calls for fcntl Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | runtime/bin/eventhandler_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/eventhandler_android.cc
diff --git a/runtime/bin/eventhandler_android.cc b/runtime/bin/eventhandler_android.cc
index c3f6836355255315edeb788e9cbd4a7d7af8c1d1..c9c4b0de306b115e63005d15b7fb72eafee50014 100644
--- a/runtime/bin/eventhandler_android.cc
+++ b/runtime/bin/eventhandler_android.cc
@@ -86,18 +86,26 @@ EventHandlerImplementation::EventHandlerImplementation()
if (result != 0) {
FATAL("Pipe creation failed");
}
- FDUtils::SetNonBlocking(interrupt_fds_[0]);
- FDUtils::SetCloseOnExec(interrupt_fds_[0]);
- FDUtils::SetCloseOnExec(interrupt_fds_[1]);
+ if (!FDUtils::SetNonBlocking(interrupt_fds_[0])) {
+ FATAL("Failed to set pipe fd non blocking\n");
+ }
+ if (!FDUtils::SetCloseOnExec(interrupt_fds_[0])) {
+ FATAL("Failed to set pipe fd close on exec\n");
+ }
+ if (!FDUtils::SetCloseOnExec(interrupt_fds_[1])) {
+ FATAL("Failed to set pipe fd close on exec\n");
+ }
shutdown_ = false;
- // The initial size passed to epoll_create is ignore on newer (>=
- // 2.6.8) Linux versions
+ // The initial size passed to epoll_create is ignored on newer (>= 2.6.8)
+ // Linux versions
static const int kEpollInitialSize = 64;
epoll_fd_ = NO_RETRY_EXPECTED(epoll_create(kEpollInitialSize));
if (epoll_fd_ == -1) {
FATAL1("Failed creating epoll file descriptor: %i", errno);
}
- FDUtils::SetCloseOnExec(epoll_fd_);
+ if (!FDUtils::SetCloseOnExec(epoll_fd_)) {
+ FATAL("Failed to set epoll fd close on exec\n");
+ }
// Register the interrupt_fd with the epoll instance.
struct epoll_event event;
event.events = EPOLLIN;
« no previous file with comments | « no previous file | runtime/bin/eventhandler_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698