aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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();
}