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

Side by Side Diff: chromeos/process_proxy/process_output_watcher.cc

Issue 100253002: Don't HANDLE_EINTR(close). Either IGNORE_EINTR(close) or just close. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/process_proxy/process_output_watcher.h" 5 #include "chromeos/process_proxy/process_output_watcher.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cstdio> 8 #include <cstdio>
9 #include <cstring> 9 #include <cstring>
10 10
11 #include <sys/ioctl.h> 11 #include <sys/ioctl.h>
12 #include <sys/select.h> 12 #include <sys/select.h>
13 #include <unistd.h> 13 #include <unistd.h>
14 14
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/posix/eintr_wrapper.h" 16 #include "base/posix/eintr_wrapper.h"
17 17
18 namespace { 18 namespace {
19 19
20 void InitReadFdSet(int out_fd, int stop_fd, fd_set* set) { 20 void InitReadFdSet(int out_fd, int stop_fd, fd_set* set) {
21 FD_ZERO(set); 21 FD_ZERO(set);
22 if (out_fd != -1) 22 if (out_fd != -1)
23 FD_SET(out_fd, set); 23 FD_SET(out_fd, set);
24 FD_SET(stop_fd, set); 24 FD_SET(stop_fd, set);
25 } 25 }
26 26
27 void CloseFd(int* fd) { 27 void CloseFd(int* fd) {
28 if (*fd >= 0) { 28 if (*fd >= 0) {
29 if (HANDLE_EINTR(close(*fd)) != 0) 29 if (IGNORE_EINTR(close(*fd)) != 0)
30 DPLOG(WARNING) << "close fd " << *fd << " failed."; 30 DPLOG(WARNING) << "close fd " << *fd << " failed.";
31 } 31 }
32 *fd = -1; 32 *fd = -1;
33 } 33 }
34 34
35 } // namespace 35 } // namespace
36 36
37 namespace chromeos { 37 namespace chromeos {
38 38
39 ProcessOutputWatcher::ProcessOutputWatcher(int out_fd, int stop_fd, 39 ProcessOutputWatcher::ProcessOutputWatcher(int out_fd, int stop_fd,
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 // We have lost contact with the process, so report it. 111 // We have lost contact with the process, so report it.
112 on_read_callback_.Run(PROCESS_OUTPUT_TYPE_EXIT, ""); 112 on_read_callback_.Run(PROCESS_OUTPUT_TYPE_EXIT, "");
113 } 113 }
114 } 114 }
115 115
116 void ProcessOutputWatcher::OnStop() { 116 void ProcessOutputWatcher::OnStop() {
117 delete this; 117 delete this;
118 } 118 }
119 119
120 } // namespace chromeos 120 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/debug_daemon_client.cc ('k') | chromeos/process_proxy/process_output_watcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698