diff options
| author | Rickard Green <[email protected]> | 2015-03-24 16:56:08 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-24 16:56:08 +0100 |
| commit | 5345727d647ea65b7a0417c87b94cf958ef9ee13 (patch) | |
| tree | bcc1c75102741e9768c88b1481390e40e32586e7 /erts/emulator/sys/unix/sys.c | |
| parent | a11cec66e37c039d33091db056c0ae44405043ac (diff) | |
| parent | c20482023b70768bd84d25f1e34dbbc2fe09cf31 (diff) | |
| download | otp-5345727d647ea65b7a0417c87b94cf958ef9ee13.tar.gz otp-5345727d647ea65b7a0417c87b94cf958ef9ee13.tar.bz2 otp-5345727d647ea65b7a0417c87b94cf958ef9ee13.zip | |
Merge branch 'rickard/time_api/OTP-11997'
* rickard/time_api/OTP-11997:
Better OS system time implementation
Documentation adjustments
Fix zero timout timers
erts_sys_hrtime() for lcnt
Better support for poor os monotonic sources
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/emulator/sys/unix/sys.c')
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index f1c785890c..7d52650a70 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -556,18 +556,18 @@ erts_sys_pre_init(void) erts_thr_init(&eid); -#endif /* USE_THREADS */ - - erts_init_sys_time_sup(); - -#ifdef USE_THREADS - report_exit_list = NULL; #ifdef ERTS_ENABLE_LOCK_COUNT erts_lcnt_init(); #endif +#endif /* USE_THREADS */ + + erts_init_sys_time_sup(); + +#ifdef USE_THREADS + #if CHLDWTHR || defined(ERTS_SMP) erts_mtx_init(&chld_stat_mtx, "child_status"); #endif |