Skip to content

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

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

Closed
apapirovski wants to merge 4 commits into from
Closed

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

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28fbd73
src: move GetNow to Environment
apapirovski Feb 4, 2018
f24c570
tls: provide now value from C++
apapirovski Feb 4, 2018
18b06b8
fixup: too many f's to count
apapirovski Feb 4, 2018
6748de4
fixup: bnoordhuis comment
apapirovski Feb 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup: too many f's to count
  • Loading branch information
@apapirovski
apapirovski committed Feb 4, 2018
commit 18b06b8656a0880be5f81f6a6a827e976c17c1f5
2 changes: 1 addition & 1 deletion src/env.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ Local<Value> Environment::GetNow() {
uint64_t now = uv_now(event_loop());
CHECK(now >= timer_base());
Copy link
Member

@bnoordhuis bnoordhuis Feb 6, 2018

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.)

now -= timer_base();
if (now <= 0xfffffff)
if (now <= 0xffffffff)
return Integer::New(isolate(), static_cast<uint32_t>(now));
else
return Number::New(isolate(), static_cast<double>(now));
Expand Down