| OLD | NEW |
| 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 "chrome/browser/chromeos/process_proxy/process_output_watcher.h" | 5 #include "chrome/browser/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/eintr_wrapper.h" | |
| 16 #include "base/logging.h" | 15 #include "base/logging.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 |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 CloseFd(fd); | 107 CloseFd(fd); |
| 108 | 108 |
| 109 // We have lost contact with the process, so report it. | 109 // We have lost contact with the process, so report it. |
| 110 on_read_callback_.Run(PROCESS_OUTPUT_TYPE_EXIT, ""); | 110 on_read_callback_.Run(PROCESS_OUTPUT_TYPE_EXIT, ""); |
| 111 } | 111 } |
| 112 } | 112 } |
| 113 | 113 |
| 114 void ProcessOutputWatcher::OnStop() { | 114 void ProcessOutputWatcher::OnStop() { |
| 115 delete this; | 115 delete this; |
| 116 } | 116 } |
| OLD | NEW |