unix,stream: fix getting the correct fd for a handle #6838

saghul · 2016-05-18T14:14:42Z

Checklist

tests and code linting passes
a test and/or benchmark is included
documentation is changed or added
the commit message follows commit guidelines

Affected core subsystem(s)

stream

Description of change

On OSX it's possible that the fd is replaced, so use the proper libuv
API to get the correct fd.

kzc · 2016-05-18T14:19:23Z

This is the test case that does not work as expected with node 4.x and 5.x on Mac:

$ node -e 'require("fs").writeSync(process.stdout._handle.fd, "Hello.\n")'

cjihrig · 2016-05-18T14:23:14Z

Can we translate that into an actual test to prevent regressions?

saghul · 2016-05-18T14:23:30Z

Also, bonus nachos: we're no longer relying on libuv internals to get the fd.

saghul · 2016-05-18T14:31:50Z

Can we translate that into an actual test to prevent regressions?

I'm not sure. It would be a OSX only test, which only works if we replaced the fd in the select trick. This could change over time if Apple fixes kqueue to support other fds.

An alternate title would be along the lines of: "use official uv API instead of internal structures".

kzc · 2016-05-18T14:39:41Z

Because it's a tty test it's more difficult to automate. Spawning, piping and redirecting change the code path within node and libuv pertaining to stdout and stderr.

cjihrig · 2016-05-18T15:33:56Z

OK, well I did verify that the change worked on my OS X box, so LGTM.

jasnell · 2016-05-18T15:53:59Z

Nice. LGTM. A test would be good but can definitely understand the constraints.

bnoordhuis · 2016-05-18T16:15:07Z

src/stream_wrap.cc

@@ -86,7 +86,7 @@ int StreamWrap::GetFD() {
  int fd = -1;
 #if !defined(_WIN32)
  if (stream() != nullptr)
-    fd = stream()->io_watcher.fd;
+    uv_fileno(reinterpret_cast<uv_handle_t*>(stream()), &fd);
 #endif


I think you might as well remove the #if !defined(_WIN32) guard now.

On Windows that's a HANDLE*, and while it can be cast to an int because only 32 bits are used AFAIS, I wasn't sure if we wanted to expose that.

Good point. Let's leave it like this, then.

kzc · 2016-05-18T16:26:26Z

FWIW, dtruss on Mac showed that node 4.x and 5.x process.stdout._handle.fd was returning a closed fd in this case:

node -e 'require("fs").writeSync(process.stdout._handle.fd, "Hello.\n")'

bnoordhuis · 2016-05-18T16:45:03Z

LGTM

On OSX it's possible that the fd is replaced, so use the proper libuv API to get the correct fd. PR-URL: nodejs#6753 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

bnoordhuis · 2016-05-20T11:30:38Z

@saghul I didn't realize it at the time but we have similar logic in src/udp_wrap.cc.

saghul · 2016-05-20T11:33:42Z

Oh, me neither. I'll make a PR later today if nobody beats me to it.
On May 20, 2016 12:31, "Ben Noordhuis" notifications@github.com wrote:

@saghul https://github.com/saghul I didn't realize it at the time but
we have similar logic in src/udp_wrap.cc.

—
You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#6838 (comment)

Refs: nodejs#6838 PR-URL: nodejs#6908 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

Fishrock123 · 2016-05-25T23:21:45Z

^ @thealphanerd

MylesBorins · 2016-05-26T04:24:56Z

@Fishrock123 patch applies cleanly to v4.x-staging will land after it has lived in a release for a week 😄

Refs: nodejs#6838 PR-URL: nodejs#6908 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

MylesBorins · 2016-06-01T22:56:06Z

@saghul is this at all specific to v1.9.0?

Refs: #6838 PR-URL: #6908 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

Refs: nodejs#6838 PR-URL: nodejs#6908 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

Refs: #6838 PR-URL: #6908 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

nodejs-github-bot added the c++ Issues and PRs that require attention from people who are familiar with C++. label May 18, 2016

saghul mentioned this pull request May 18, 2016

stdio buffered writes (chunked) issues & process.exit() truncation #6456

Closed

mscdex added the stream Issues and PRs related to the stream subsystem. label May 18, 2016

bnoordhuis reviewed May 18, 2016
View reviewed changes

kzc mentioned this pull request May 18, 2016

process: flush stdout/stderr upon process.exit() #6773

Closed

4 tasks

saghul force-pushed the fix-getfd branch from e10355b to 4fe1d6e Compare May 19, 2016 08:55

saghul closed this May 19, 2016

saghul deleted the fix-getfd branch May 19, 2016 08:55

saghul merged commit 4fe1d6e into nodejs:master May 19, 2016

saghul mentioned this pull request May 20, 2016

udp: use libuv API to get file descriptor #6908

Merged

kzc mentioned this pull request May 25, 2016

Tracking issue: stdio problems #6980

Closed

8 tasks

Fishrock123 added the lts-watch-v4.x label May 25, 2016

MylesBorins self-assigned this May 26, 2016

rvagg pushed a commit that referenced this pull request Jun 2, 2016

udp: use libuv API to get file descriptor

36ed4a2

Refs: #6838 PR-URL: #6908 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

saghul mentioned this pull request Jun 3, 2016

uv: let's discuss the backport policy for LTS #6806

Closed

4 tasks

MylesBorins pushed a commit that referenced this pull request Jul 11, 2016

udp: use libuv API to get file descriptor

9946b56

Refs: #6838 PR-URL: #6908 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

MylesBorins added dont-land-on-v4.x and removed lts-watch-v4.x labels Jul 11, 2016

MylesBorins pushed a commit that referenced this pull request Jul 11, 2016

udp: use libuv API to get file descriptor

6c1904b

Refs: #6838 PR-URL: #6908 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

MylesBorins pushed a commit that referenced this pull request Jul 12, 2016

udp: use libuv API to get file descriptor

8a87ef3

Refs: #6838 PR-URL: #6908 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

MylesBorins pushed a commit that referenced this pull request Jul 14, 2016

udp: use libuv API to get file descriptor

973abab

Refs: #6838 PR-URL: #6908 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

MylesBorins pushed a commit that referenced this pull request Jul 14, 2016

udp: use libuv API to get file descriptor

a1719a9

Refs: #6838 PR-URL: #6908 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

MylesBorins removed their assignment Dec 27, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

unix,stream: fix getting the correct fd for a handle #6838

unix,stream: fix getting the correct fd for a handle #6838

saghul commented May 18, 2016

kzc commented May 18, 2016

cjihrig commented May 18, 2016

saghul commented May 18, 2016

saghul commented May 18, 2016

kzc commented May 18, 2016

cjihrig commented May 18, 2016

jasnell commented May 18, 2016

bnoordhuis May 18, 2016

saghul May 18, 2016

bnoordhuis May 18, 2016

kzc commented May 18, 2016

bnoordhuis commented May 18, 2016

bnoordhuis commented May 20, 2016

saghul commented May 20, 2016

Fishrock123 commented May 25, 2016

MylesBorins commented May 26, 2016

MylesBorins commented Jun 1, 2016

unix,stream: fix getting the correct fd for a handle #6838

unix,stream: fix getting the correct fd for a handle #6838

Conversation

saghul commented May 18, 2016

Checklist

Affected core subsystem(s)

Description of change

kzc commented May 18, 2016

cjihrig commented May 18, 2016

saghul commented May 18, 2016

saghul commented May 18, 2016

kzc commented May 18, 2016

cjihrig commented May 18, 2016

jasnell commented May 18, 2016

bnoordhuis May 18, 2016

Choose a reason for hiding this comment

saghul May 18, 2016

Choose a reason for hiding this comment

bnoordhuis May 18, 2016

Choose a reason for hiding this comment

kzc commented May 18, 2016

bnoordhuis commented May 18, 2016

bnoordhuis commented May 20, 2016

saghul commented May 20, 2016

Fishrock123 commented May 25, 2016

MylesBorins commented May 26, 2016

MylesBorins commented Jun 1, 2016