aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_init.c
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2010-12-29 15:48:39 +0100
committerBjörn-Egil Dahlberg <[email protected]>2010-12-29 15:48:39 +0100
commitb35412e5eed93875a9c8c47fc8dec3392947b986 (patch)
tree38f9eee54ff34736cc14c4128c3fa1bfcc1e1474 /erts/emulator/beam/erl_init.c
parent609e7ade98cb278f890e1d53a65356b4d9f12422 (diff)
parente7a56088a38bf79a650659b5b6381f71af75c740 (diff)
downloadotp-b35412e5eed93875a9c8c47fc8dec3392947b986.tar.gz
otp-b35412e5eed93875a9c8c47fc8dec3392947b986.tar.bz2
otp-b35412e5eed93875a9c8c47fc8dec3392947b986.zip
Merge branch 'egil/timer-wheel-min-time/OTP-8990' into dev
* egil/timer-wheel-min-time/OTP-8990: Teach timer-wheel slots to use double linked lists Remove timer-thread implementation Refactor timer interface Teach timer-wheel to keep min time
Diffstat (limited to 'erts/emulator/beam/erl_init.c')
-rw-r--r--erts/emulator/beam/erl_init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index f4e0717d30..0a57eb6d88 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -250,7 +250,7 @@ erl_init(int ncpu)
erts_init_monitors();
erts_init_gc();
- init_time();
+ erts_init_time();
erts_init_sys_common_misc();
erts_init_process(ncpu);
erts_init_scheduling(use_multi_run_queue,
@@ -289,7 +289,7 @@ erl_init(int ncpu)
erts_delay_trap = erts_export_put(am_erlang, am_delay_trap, 2);
erts_late_init_process();
#if HAVE_ERTS_MSEG
- erts_mseg_late_init(); /* Must be after timer (init_time()) and thread
+ erts_mseg_late_init(); /* Must be after timer (erts_init_time()) and thread
initializations */
#endif
#ifdef HIPE