Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tls: pass in Timer.now() value straight from C++ #18562

Closed
wants to merge 4 commits into from
Closed

tls: pass in Timer.now() value straight from C++ #18562

wants to merge 4 commits into from

Conversation

apapirovski
Copy link
Member

Instead of separately calling into C++ from JS to retrieve the Timer.now() value, pass it in as an argument.

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

tls, src

@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. labels Feb 4, 2018
bnoordhuis
bnoordhuis approved these changes Feb 4, 2018
View reviewed changes
src/env.cc Outdated
return Integer::New(this->isolate(), static_cast<uint32_t>(now));
else
return Number::New(this->isolate(), static_cast<double>(now));
}
Copy link
Member

Choose a reason for hiding this comment

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

The this-> prefixes aren't necessary.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks. Total brain fart there, haha.

src/tls_wrap.cc Outdated
@@ -230,7 +230,8 @@ void TLSWrap::SSLInfoCallback(const SSL* ssl_, int where, int ret) {
if (where & SSL_CB_HANDSHAKE_START) {
Local<Value> callback = object->Get(env->onhandshakestart_string());
if (callback->IsFunction()) {
c->MakeCallback(callback.As<Function>(), 0, nullptr);
Local<Value> argv[] = { env->GetNow() };
c->MakeCallback(callback.As<Function>(), 1, argv);
Copy link
Member

Choose a reason for hiding this comment

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

Can you use arraysize(argv)?

@apapirovski
src: move GetNow to Environment
28fbd73
@apapirovski
tls: provide now value from C++
f24c570 
Instead of separately calling into C++ from JS to retrieve
the Timer.now() value, pass it in as an argument.
@apapirovski
Copy link
Member Author

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

addaleax
addaleax approved these changes Feb 4, 2018
View reviewed changes
src/env.cc Outdated
uint64_t now = uv_now(event_loop());
CHECK(now >= timer_base());
now -= timer_base();
if (now <= 0xfffffff)
Copy link
Member

Choose a reason for hiding this comment

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

I think you could go until at least 0x7fffffff here?

Copy link
Member Author

Choose a reason for hiding this comment

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

I think that might actually be missing an extra f? I think it's supposed to be 2**32 - 1, no?

Copy link
Member

Choose a reason for hiding this comment

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

@apapirovski If you want that then yes, one more f than in the current code it is (0xffffffff)

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, looks like that's been incorrect since it got first committed like 3-4 years ago :)

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks! :)

@BridgeAR BridgeAR added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Feb 6, 2018
bnoordhuis
bnoordhuis reviewed Feb 6, 2018
View reviewed changes
src/env.cc Outdated
Local<Value> Environment::GetNow() {
uv_update_time(event_loop());
uint64_t now = uv_now(event_loop());
CHECK(now >= timer_base());
Copy link
Member

Choose a reason for hiding this comment

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

CHECK_GE

(Sorry, probably forgot to mention that last time.)

@apapirovski
Copy link
Member Author

Lite CI: https://ci.nodejs.org/job/node-test-pull-request-lite/158/ (small change)

apapirovski added a commit that referenced this pull request Feb 7, 2018
@apapirovski
src: move GetNow to Environment
1573e45 
PR-URL: #18562
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
apapirovski added a commit that referenced this pull request Feb 7, 2018
@apapirovski
tls: provide now value from C++
92ba624 
Instead of separately calling into C++ from JS to retrieve
the Timer.now() value, pass it in as an argument.

PR-URL: #18562
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
@apapirovski
Copy link
Member Author

Landed in 1573e45 and 92ba624

@apapirovski apapirovski closed this Feb 7, 2018
@apapirovski apapirovski deleted the patch-tls-timer-now branch February 7, 2018 17:23
@MylesBorins
Copy link
Contributor

Should this be backported to v9.x-staging? If yes please follow the guide and raise a backport PR, if not let me know or add the dont-land-on label.

@addaleax addaleax removed the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Feb 27, 2018
MayaLekova pushed a commit to MayaLekova/node that referenced this pull request May 8, 2018
@apapirovski @MayaLekova
src: move GetNow to Environment
d987d77 
PR-URL: nodejs#18562
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
MayaLekova pushed a commit to MayaLekova/node that referenced this pull request May 8, 2018
@apapirovski @MayaLekova
tls: provide now value from C++
9c3ff5d 
Instead of separately calling into C++ from JS to retrieve
the Timer.now() value, pass it in as an argument.

PR-URL: nodejs#18562
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
@MylesBorins
Copy link
Contributor

Should this be backported to v8.x-staging? If yes please follow the guide and raise a backport PR, if not let me know or add the dont-land-on label.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bnoordhuis bnoordhuis bnoordhuis approved these changes

@addaleax addaleax addaleax approved these changes

@jasnell jasnell jasnell approved these changes

@BridgeAR BridgeAR BridgeAR approved these changes

Assignees
No one assigned
Labels
c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@apapirovski @MylesBorins @bnoordhuis @jasnell @addaleax @BridgeAR @nodejs-github-bot