runtime/bin/eventhandler_android.cc - Issue 18031003: Stop printing when stdout is closed.

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_android.cc

Issue 18031003: Stop printing when stdout is closed. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Add include for all platforms and don't leak fds. Created 7 years, 6 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:

Index: runtime/bin/eventhandler_android.cc

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

index bbc8acbc8bec5ea726fc780a7cb6b62bb49d7e20..74fb5da5c3e294492a5e535401e9eb9b019667f8 100644

--- a/runtime/bin/eventhandler_android.cc

+++ b/runtime/bin/eventhandler_android.cc

@@ -14,6 +14,7 @@

#include <sys/epoll.h> // NOLINT

#include <sys/stat.h> // NOLINT

#include <unistd.h> // NOLINT

+#include <fcntl.h> // NOLINT

#include "bin/dartutils.h"

#include "bin/fdutils.h"

@@ -215,7 +216,15 @@ void EventHandlerImplementation::HandleInterruptFd() {

// next message.

RemoveFromEpollInstance(epoll_fd_, sd);

intptr_t fd = sd->fd();

- sd->Close();

+ if (fd == STDOUT_FILENO) {

+ // If stdout, redirect fd to /dev/null.

+ int null_fd = TEMP_FAILURE_RETRY(open("/dev/null", O_WRONLY));

+ ASSERT(null_fd >= 0);

+ VOID_TEMP_FAILURE_RETRY(dup2(null_fd, STDOUT_FILENO));

Bill Hesse 2013/06/27 16:42:36 OK, so stdout is still open at this point, so we k

+ VOID_TEMP_FAILURE_RETRY(close(null_fd));

+ } else {

+ sd->Close();

+ }

socket_map_.Remove(GetHashmapKeyFromFd(fd), GetHashmapHashFromFd(fd));

delete sd;

} else {

« no previous file with comments | « no previous file | runtime/bin/eventhandler_linux.cc » ('j') | no next file with comments »