github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: make process.uptime() return the correct time (#19436) (#19566)

Browse Source
This commit is contained in:
Micha Hanselmann
2019-08-01 14:02:00 -07:00
committed by Samuel Attard
parent 3af498e17c
commit b4f5c4ba4a
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/common/node/.patches
View File

@@ -42,3 +42,4 @@ src_read_break_node_first_line_from_the_inspect_options.patch
chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch
inherit_electron_crashpad_pipe_name_in_child_process.patch
http2_fix_tracking_received_data_for_maxsessionmemory.patch
fix_set_uptime_offset_in_correct_init_method.patch

29
patches/common/node/fix_set_uptime_offset_in_correct_init_method.patch Normal file
View File

@@ -0,0 +1,29 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Micha Hanselmann <deermichel@github.com>
Date: Thu, 1 Aug 2019 09:34:18 -0700
Subject: fix: set uptime offset in correct init method
This patch can be removed after 'https://github.com/nodejs/node/pull/28849' landed here.
diff --git a/src/node.cc b/src/node.cc
index 2f2b52e13362bec6fcee5716d9a2bc9b3480b939..09388ade842eb35eb09581ed6e65e984eac63e78 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -646,6 +646,9 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
// Make sure InitializeNodeWithArgs() is called only once.
CHECK(!init_called.exchange(true));
+ // Initialize node_start_time to get relative uptime.
+ per_process::node_start_time = uv_hrtime();
+
// Register built-in modules
binding::RegisterBuiltinModules();
@@ -925,7 +928,6 @@ inline int StartNodeWithLoopAndArgs(uv_loop_t* event_loop,
int Start(int argc, char** argv) {
atexit([] () { uv_tty_reset_mode(); });
PlatformInit();
- per_process::node_start_time = uv_hrtime();
CHECK_GT(argc, 0);