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

process: fix calculation in process.uptime() #26206

Closed
wants to merge 3 commits into from
Closed

process: fix calculation in process.uptime() #26206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd09f7f
process: fix calculation in process.uptime()
joyeecheung Feb 19, 2019
a6ea194
process: move test-process-uptime to parallel
joyeecheung Feb 19, 2019
fd7520e
fixup! process: move test-process-uptime to parallel
Trott Feb 19, 2019
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
6 changes: 2 additions & 4 deletions src/node_process_methods.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,8 @@ Mutex umask_mutex;

// Microseconds in a second, as a float, used in CPUUsage() below
#define MICROS_PER_SEC 1e6
// used in Hrtime() below
// used in Hrtime() and Uptime() below
#define NANOS_PER_SEC 1000000000
// Used in Uptime()
#define NANOS_PER_MICROS 1e3

#ifdef _WIN32
/* MAX_PATH is in characters, not bytes. Make sure we have enough headroom. */
Expand Down Expand Up @@ -246,7 +244,7 @@ static void Uptime(const FunctionCallbackInfo<Value>& args) {
uv_update_time(env->event_loop());
double uptime =
static_cast<double>(uv_hrtime() - per_process::node_start_time);
Local<Number> result = Number::New(env->isolate(), uptime / NANOS_PER_MICROS);
Local<Number> result = Number::New(env->isolate(), uptime / NANOS_PER_SEC);
args.GetReturnValue().Set(result);
}

Expand Down
12 changes: 6 additions & 6 deletions test/pummel/test-process-uptime.js → test/parallel/test-process-uptime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ require('../common');
const assert = require('assert');

console.error(process.uptime());
assert.ok(process.uptime() <= 2);
// Add some wiggle room for different platforms.
// Verify that the returned value is in seconds -
// 15 seconds should be a good estimate.
assert.ok(process.uptime() <= 15);

const original = process.uptime();

setTimeout(function() {
const uptime = process.uptime();
// some wiggle room to account for timer
// granularity, processor speed, and scheduling
assert.ok(uptime >= original + 2);
assert.ok(uptime <= original + 3);
}, 2000);
assert.ok(original < uptime);
}, 10);