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

Unified Diff: runtime/bin/file_system_watcher_macos.cc

Issue 165723007: Move signal_blocker to platform and use it by default in TEMP_FAILURE_RETRY. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Tiny fix. Created 6 years, 9 months 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 | « runtime/bin/file_system_watcher_linux.cc ('k') | runtime/bin/process_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/file_system_watcher_macos.cc
diff --git a/runtime/bin/file_system_watcher_macos.cc b/runtime/bin/file_system_watcher_macos.cc
index 30322c87aae70af0cb674b90c614f0f6060acd8e..88d98d40d4352a10e0eb49b56f5d159b41c9d6fe 100644
--- a/runtime/bin/file_system_watcher_macos.cc
+++ b/runtime/bin/file_system_watcher_macos.cc
@@ -18,6 +18,8 @@
#include "bin/socket.h"
#include "bin/thread.h"
+#include "platform/signal_blocker.h"
+
#ifndef MAC_OS_X_VERSION_10_7
enum {
@@ -71,7 +73,7 @@ class FSEventsWatcher {
~Node() {
Stop();
- close(write_fd_);
+ VOID_TEMP_FAILURE_RETRY(close(write_fd_));
CFRelease(path_ref_);
}
@@ -261,7 +263,7 @@ class FSEventsWatcher {
Node* AddPath(const char* path, int events, bool recursive) {
int fds[2];
- VOID_TEMP_FAILURE_RETRY(pipe(fds));
+ VOID_NO_RETRY_EXPECTED(pipe(fds));
Socket::SetNonBlocking(fds[0]);
Socket::SetBlocking(fds[1]);
« no previous file with comments | « runtime/bin/file_system_watcher_linux.cc ('k') | runtime/bin/process_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698