FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

src: fix the false isatty() issue on IBMi by dmabupt · Pull Request #30829 · nodejs/node · GitHub

/ node Public

src: fix the false isatty() issue on IBMi - #30829

Closed
dmabupt wants to merge 1 commit into
nodejs:masterfrom
dmabupt:ibmi_isatty
ConversationCommits (1)ChecksFiles changed
Closed

src: fix the false isatty() issue on IBMi#30829
dmabupt wants to merge 1 commit into
nodejs:masterfrom
dmabupt:ibmi_isatty

Conversation

dmabupt commented Dec 7, 2019

Copy link
Copy Markdown
Contributor

IBMi PASE always says it is a tty terminal.
For ssh terminals it is true, but for terminals like TN5250 it is not.
Need to identify whether it is actually in a TTY or not.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines

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

richardlau commented Dec 7, 2019

Copy link
Copy Markdown
Member

Presumably this is related to https://www.ibm.com/support/pages/nodejs-failure-pase-error-560-assertion? (And, if so, setting the PASE_STDIO_ISATTY environment variable in code is not an option?)

dmabupt commented Dec 7, 2019

Copy link
Copy Markdown
Contributor Author

Presumably this is related to https://www.ibm.com/support/pages/nodejs-failure-pase-error-560-assertion? (And, if so, setting the PASE_STDIO_ISATTY environment variable in code is not an option?)

Yes, that is the issue.
We can work around by setting PASE_STDIO_ISATTY=N but I think maybe it is better to directly get the result.

cjihrig commented Dec 7, 2019

Copy link
Copy Markdown
Contributor

Somewhat related question: is it worth teaching uv_guess_handle() about this?

richardlau approved these changes Dec 7, 2019
View reviewed changes
Comment thread src/node.cc Outdated

richardlau commented Dec 7, 2019

Copy link
Copy Markdown
Member

There are some linter failures:

https://travis-ci.com/nodejs/node/jobs/264279822#L301-L308

Running C++ linter...
src/node.cc:113:  Line ends in whitespace.  Consider deleting these extra spaces.  [whitespace/end_of_line] [4]
src/node.cc:562:  Line ends in whitespace.  Consider deleting these extra spaces.  [whitespace/end_of_line] [4]
src/node.cc:564:  Line ends in whitespace.  Consider deleting these extra spaces.  [whitespace/end_of_line] [4]
src/node.cc:565:  Use nullptr instead of NULL  [readability/null_usage] [2]
src/node.cc:566:  Line ends in whitespace.  Consider deleting these extra spaces.  [whitespace/end_of_line] [4]
Done processing src/node.cc
Total errors found: 5

nodejs-github-bot commented Dec 7, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/27452/

dmabupt commented Dec 7, 2019

Copy link
Copy Markdown
Contributor Author

uv_guess_handle()

Hello @cjihrig , Do you know any API or test case using uv_guess_handle()? I found test/parallel/test-ttywrap-invalid-fd.js but it seems to be an internal case that I can not directly run?

richardlau added the author ready PRs that have at least one approval, no outstanding review comments, and a CI started. label Dec 7, 2019

richardlau commented Dec 7, 2019

Copy link
Copy Markdown
Member

uv_guess_handle()

Hello @cjihrig , Do you know any API or test case using uv_guess_handle()? I found test/parallel/test-ttywrap-invalid-fd.js but it seems to be an internal case that I can not directly run?

@dmabupt If you're not running via the test runner (i.e. tools/test.py parallel/test-ttywrap-invalid-fd) you need to append the flags from the // Flags: comment (i.e. node --expose-internals test/parallel/test-ttywrap-invalid-fd.js).

libuv has its own tests that use uv_guess_handle(). See build instructions and running tests for how to build libuv and run tests (I assume you already know this since you've already contributed to libuv).

cjihrig commented Dec 7, 2019

Copy link
Copy Markdown
Contributor

@dmabupt the documentation for uv_guess_handle() states:

For isatty(3) equivalent functionality use this function and test for UV_TTY.

So I just thought that while you're adding this functionality to Node, it would probably be worthwhile to add it to libuv as well. In fact, uv_guess_handle() could then be used to clean this code up a little bit (one less #ifdef).

dmabupt commented Dec 8, 2019

Copy link
Copy Markdown
Contributor Author

@dmabupt the documentation for uv_guess_handle() states:

For isatty(3) equivalent functionality use this function and test for UV_TTY.

So I just thought that while you're adding this functionality to Node, it would probably be worthwhile to add it to libuv as well. In fact, uv_guess_handle() could then be used to clean this code up a little bit (one less #ifdef).

Thanks for the information. I have submiited a PR for that.

nodejs-github-bot commented Dec 8, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/27490/

nodejs-github-bot commented Dec 8, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/27492/

src: fix the false isatty() issue on IBMi
5644ec6 
On IBMi PASE isatty() always returns true for stdin, stdout and stderr.
Use ioctl() instead to identify whether it's actually a TTY.

dmabupt commented Dec 9, 2019

Copy link
Copy Markdown
Contributor Author

I have updated the code to --

    if (ioctl(fd, TXISATTY + 0x81, nullptr) == -1 && errno == ENOTTY)
      continue;

to specifically detect the ENOTTY environment.

nodejs-github-bot commented Dec 9, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/27509/

mhdawson approved these changes Dec 9, 2019
View reviewed changes

mhdawson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

LGTM

BridgeAR pushed a commit that referenced this pull request Dec 9, 2019
src: fix the false isatty() issue on IBMi
68874a6 
On IBMi PASE isatty() always returns true for stdin, stdout and stderr.
Use ioctl() instead to identify whether it's actually a TTY.

PR-URL: #30829
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>

BridgeAR commented Dec 9, 2019

Copy link
Copy Markdown
Member

Landed in 68874a6 🎉

BridgeAR closed this Dec 9, 2019
dmabupt deleted the ibmi_isatty branch December 10, 2019 05:35
targos pushed a commit that referenced this pull request Dec 10, 2019
src: fix the false isatty() issue on IBMi
6088603 
On IBMi PASE isatty() always returns true for stdin, stdout and stderr.
Use ioctl() instead to identify whether it's actually a TTY.

PR-URL: #30829
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
MylesBorins mentioned this pull request Dec 13, 2019
Merged
targos pushed a commit that referenced this pull request Jan 14, 2020
src: fix the false isatty() issue on IBMi
1743738 
On IBMi PASE isatty() always returns true for stdin, stdout and stderr.
Use ioctl() instead to identify whether it's actually a TTY.

PR-URL: #30829
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
targos mentioned this pull request Jan 15, 2020
Closed
cjihrig added a commit to cjihrig/node that referenced this pull request Jan 15, 2020
src: use uv_guess_handle() to detect TTYs
38c0784 
This commit reverts nodejs#30829
and uses uv_guess_handle() instead of isatty(). The IBMi
changes are no longer required, as of libuv 1.34.1.

PR-URL: nodejs#31333
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
MylesBorins pushed a commit that referenced this pull request Jan 16, 2020
src: use uv_guess_handle() to detect TTYs
6534c6c 
This commit reverts #30829
and uses uv_guess_handle() instead of isatty(). The IBMi
changes are no longer required, as of libuv 1.34.1.

PR-URL: #31333
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
BethGriggs pushed a commit that referenced this pull request Feb 6, 2020
src: fix the false isatty() issue on IBMi
e00c4e4 
On IBMi PASE isatty() always returns true for stdin, stdout and stderr.
Use ioctl() instead to identify whether it's actually a TTY.

PR-URL: #30829
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
MylesBorins mentioned this pull request Feb 8, 2020
Merged
codebytere pushed a commit that referenced this pull request Mar 14, 2020
src: use uv_guess_handle() to detect TTYs
7b0687d 
This commit reverts #30829
and uses uv_guess_handle() instead of isatty(). The IBMi
changes are no longer required, as of libuv 1.34.1.

PR-URL: #31333
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
codebytere pushed a commit that referenced this pull request Mar 17, 2020
src: use uv_guess_handle() to detect TTYs
1d075cf 
This commit reverts #30829
and uses uv_guess_handle() instead of isatty(). The IBMi
changes are no longer required, as of libuv 1.34.1.

PR-URL: #31333
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Trott Trott approved these changes
richardlau richardlau approved these changes
BridgeAR BridgeAR approved these changes
+2 more reviewers
devnexen devnexen approved these changes
mhdawson mhdawson approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

author ready PRs that have at least one approval, no outstanding review comments, and a CI started. c++ Issues and PRs that require attention from people who are familiar with C++.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

Back | FazBrowse Home | New Git URL