runtime/bin/eventhandler_linux.cc - Issue 9720045: Extend dart:io error handling to all socket functions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: runtime/bin/eventhandler_linux.cc

Issue 9720045: Extend dart:io error handling to all socket functions (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Fix Mac OS and Windows compile Created 8 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

Index: runtime/bin/eventhandler_linux.cc

diff --git a/runtime/bin/eventhandler_linux.cc b/runtime/bin/eventhandler_linux.cc

index 5ee2f84d69f020933430ee334064bd7797c02c21..0c45e1710953cbc43289e247e212034dcaac6aa4 100644

--- a/runtime/bin/eventhandler_linux.cc

+++ b/runtime/bin/eventhandler_linux.cc

@@ -262,7 +262,13 @@ intptr_t EventHandlerImplementation::GetPollEvents(intptr_t events,

if (FDUtils::AvailableBytes(sd->fd()) != 0) {

event_mask = (1 << kInEvent);

} else if (((events & EPOLLHUP) != 0)) {

Mads Ager (google) 2012/03/20 15:11:58 Remove one set of parenthesis?

Søren Gjesse 2012/03/21 09:33:36 Done.

- event_mask = (1 << kCloseEvent);

+ // If both EPOLLHUP and EPOLLERR are reported treat it as an

+ // error.

+ if (((events & EPOLLERR) != 0)) {

Mads Ager (google) 2012/03/20 15:11:58 Remove one set of parenthesis?

Søren Gjesse 2012/03/21 09:33:36 Done.

+ event_mask = (1 << kErrorEvent);

+ } else {

+ event_mask = (1 << kCloseEvent);

+ }

sd->MarkClosedRead();

} else if ((events & EPOLLERR) != 0) {

event_mask = (1 << kErrorEvent);

« no previous file with comments | « runtime/bin/builtin_natives.cc ('k') | runtime/bin/eventhandler_macos.cc » ('j') | runtime/bin/eventhandler_macos.cc » ('J')