aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJukka Jylänki <jujjyl@gmail.com>2013-04-15 17:36:32 +0300
committerJukka Jylänki <jujjyl@gmail.com>2013-04-18 20:08:28 +0300
commit477cde821da19c3a04450cf9072068b87295ec99 (patch)
tree197d5ea269b83cdcd121a30ec0856a519dd0d378
parent1c4257be3e20aa0cf9f504d0a2c994d840621e82 (diff)
Implement high-resolution timing in emscripten_get_now() when run in node. Return timing ticks consistently as seconds in all methods.
-rw-r--r--src/library_browser.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/library_browser.js b/src/library_browser.js
index c1add740..6922c42f 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -704,8 +704,12 @@ mergeInto(LibraryManager.library, {
},
emscripten_get_now: function() {
- if (window['performance'] && window['performance']['now']) {
- return window['performance']['now']();
+ if (ENVIRONMENT_IS_NODE) {
+ var t = process['hrtime']();
+ return t[0] + t[1] / 1e9;
+ }
+ else if (window['performance'] && window['performance']['now']) {
+ return window['performance']['now']() / 1000.0;
} else {
return Date.now();
}