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

Side by Side Diff: base/message_loop/message_pump_libevent_unittest.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 | « base/message_loop/message_pump_libevent.cc ('k') | base/platform_file_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 (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 "base/message_loop/message_pump_libevent.h" 5 #include "base/message_loop/message_pump_libevent.h"
6 6
7 #include <unistd.h> 7 #include <unistd.h>
8 8
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/posix/eintr_wrapper.h" 10 #include "base/posix/eintr_wrapper.h"
(...skipping 12 matching lines...) Expand all
23 23
24 virtual void SetUp() OVERRIDE { 24 virtual void SetUp() OVERRIDE {
25 Thread::Options options(MessageLoop::TYPE_IO, 0); 25 Thread::Options options(MessageLoop::TYPE_IO, 0);
26 ASSERT_TRUE(io_thread_.StartWithOptions(options)); 26 ASSERT_TRUE(io_thread_.StartWithOptions(options));
27 ASSERT_EQ(MessageLoop::TYPE_IO, io_thread_.message_loop()->type()); 27 ASSERT_EQ(MessageLoop::TYPE_IO, io_thread_.message_loop()->type());
28 int ret = pipe(pipefds_); 28 int ret = pipe(pipefds_);
29 ASSERT_EQ(0, ret); 29 ASSERT_EQ(0, ret);
30 } 30 }
31 31
32 virtual void TearDown() OVERRIDE { 32 virtual void TearDown() OVERRIDE {
33 if (HANDLE_EINTR(close(pipefds_[0])) < 0) 33 if (IGNORE_EINTR(close(pipefds_[0])) < 0)
34 PLOG(ERROR) << "close"; 34 PLOG(ERROR) << "close";
35 if (HANDLE_EINTR(close(pipefds_[1])) < 0) 35 if (IGNORE_EINTR(close(pipefds_[1])) < 0)
36 PLOG(ERROR) << "close"; 36 PLOG(ERROR) << "close";
37 } 37 }
38 38
39 MessageLoop* ui_loop() { return &ui_loop_; } 39 MessageLoop* ui_loop() { return &ui_loop_; }
40 MessageLoopForIO* io_loop() const { 40 MessageLoopForIO* io_loop() const {
41 return static_cast<MessageLoopForIO*>(io_thread_.message_loop()); 41 return static_cast<MessageLoopForIO*>(io_thread_.message_loop());
42 } 42 }
43 43
44 void OnLibeventNotification( 44 void OnLibeventNotification(
45 MessagePumpLibevent* pump, 45 MessagePumpLibevent* pump,
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 pump->WatchFileDescriptor(pipefds_[1], 153 pump->WatchFileDescriptor(pipefds_[1],
154 false, MessagePumpLibevent::WATCH_READ_WRITE, &watcher, &delegate); 154 false, MessagePumpLibevent::WATCH_READ_WRITE, &watcher, &delegate);
155 155
156 // Spoof a libevent notification. 156 // Spoof a libevent notification.
157 OnLibeventNotification(pump.get(), &watcher); 157 OnLibeventNotification(pump.get(), &watcher);
158 } 158 }
159 159
160 } // namespace 160 } // namespace
161 161
162 } // namespace base 162 } // namespace base
OLDNEW
« no previous file with comments | « base/message_loop/message_pump_libevent.cc ('k') | base/platform_file_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698