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

Side by Side Diff: ipc/ipc_channel_factory.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
« no previous file with comments | « ipc/file_descriptor_set_posix_unittest.cc ('k') | ipc/ipc_channel_posix.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ipc/ipc_channel_factory.h" 5 #include "ipc/ipc_channel_factory.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "ipc/unix_domain_socket_util.h" 9 #include "ipc/unix_domain_socket_util.h"
10 10
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 delegate_->OnClientConnected(handle); 69 delegate_->OnClientConnected(handle);
70 } 70 }
71 71
72 void ChannelFactory::OnFileCanWriteWithoutBlocking(int fd) { 72 void ChannelFactory::OnFileCanWriteWithoutBlocking(int fd) {
73 NOTREACHED() << "Listen fd should never be writable."; 73 NOTREACHED() << "Listen fd should never be writable.";
74 } 74 }
75 75
76 void ChannelFactory::Close() { 76 void ChannelFactory::Close() {
77 if (listen_fd_ < 0) 77 if (listen_fd_ < 0)
78 return; 78 return;
79 if (HANDLE_EINTR(close(listen_fd_)) < 0) 79 if (IGNORE_EINTR(close(listen_fd_)) < 0)
80 PLOG(ERROR) << "close"; 80 PLOG(ERROR) << "close";
81 listen_fd_ = -1; 81 listen_fd_ = -1;
82 if (unlink(path_.value().c_str()) < 0) 82 if (unlink(path_.value().c_str()) < 0)
83 PLOG(ERROR) << "unlink"; 83 PLOG(ERROR) << "unlink";
84 84
85 // Unregister libevent for the listening socket and close it. 85 // Unregister libevent for the listening socket and close it.
86 server_listen_connection_watcher_.StopWatchingFileDescriptor(); 86 server_listen_connection_watcher_.StopWatchingFileDescriptor();
87 } 87 }
88 88
89 } // namespace IPC 89 } // namespace IPC
OLDNEW
« no previous file with comments | « ipc/file_descriptor_set_posix_unittest.cc ('k') | ipc/ipc_channel_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698