summaryrefslogtreecommitdiff
path: root/deps/npm/node_modules/request/node_modules/performance-now/src/performance-now.coffee
diff options
context:
space:
mode:
authorMyles Borins <myles.borins@gmail.com>2017-10-26 22:35:25 -0400
committerMyles Borins <myles.borins@gmail.com>2017-10-29 21:32:15 -0400
commitace4fe566fc3af4876c7458f983feeb5eae3df26 (patch)
tree458d847e9bd56199cd0d8b34cec126c7410fb6ca /deps/npm/node_modules/request/node_modules/performance-now/src/performance-now.coffee
parent64168eb9b43e30e4c0b986c9b29c41be63e85df6 (diff)
downloadandroid-node-v8-ace4fe566fc3af4876c7458f983feeb5eae3df26.tar.gz
android-node-v8-ace4fe566fc3af4876c7458f983feeb5eae3df26.tar.bz2
android-node-v8-ace4fe566fc3af4876c7458f983feeb5eae3df26.zip
deps: update npm to 5.5.1
Closes: https://github.com/nodejs/node/pull/16280 PR-URL: https://github.com/nodejs/node/pull/16509 Fixes: https://github.com/nodejs/node/issues/14161 Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Michaƫl Zasso <targos@protonmail.com>
Diffstat (limited to 'deps/npm/node_modules/request/node_modules/performance-now/src/performance-now.coffee')
-rw-r--r--deps/npm/node_modules/request/node_modules/performance-now/src/performance-now.coffee6
1 files changed, 4 insertions, 2 deletions
diff --git a/deps/npm/node_modules/request/node_modules/performance-now/src/performance-now.coffee b/deps/npm/node_modules/request/node_modules/performance-now/src/performance-now.coffee
index e752fc5e1c..a8e075a40f 100644
--- a/deps/npm/node_modules/request/node_modules/performance-now/src/performance-now.coffee
+++ b/deps/npm/node_modules/request/node_modules/performance-now/src/performance-now.coffee
@@ -1,12 +1,14 @@
if performance? and performance.now
module.exports = -> performance.now()
else if process? and process.hrtime
- module.exports = -> (getNanoSeconds() - loadTime) / 1e6
+ module.exports = -> (getNanoSeconds() - nodeLoadTime) / 1e6
hrtime = process.hrtime
getNanoSeconds = ->
hr = hrtime()
hr[0] * 1e9 + hr[1]
- loadTime = getNanoSeconds()
+ moduleLoadTime = getNanoSeconds()
+ upTime = process.uptime() * 1e9
+ nodeLoadTime = moduleLoadTime - upTime
else if Date.now
module.exports = -> Date.now() - loadTime
loadTime = Date.now()