diff options
| author | Rickard Green <[email protected]> | 2016-09-26 15:05:21 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-09-26 15:31:33 +0200 |
| commit | ca7578aca806a6eb3e816c918120db78f485f5cb (patch) | |
| tree | 4cd7798128a3956d5332feeb501289bd690a8732 /erts/emulator/beam | |
| parent | 74a95b3d511177a9b35c2b0272b9ca5511b6f750 (diff) | |
| download | otp-ca7578aca806a6eb3e816c918120db78f485f5cb.tar.gz otp-ca7578aca806a6eb3e816c918120db78f485f5cb.tar.bz2 otp-ca7578aca806a6eb3e816c918120db78f485f5cb.zip | |
Fix initialization dependencies between time, lock-check and lcnt
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 3 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_lock_count.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index d9c3b0dcf4..611a98a30f 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -762,9 +762,6 @@ early_init(int *argc, char **argv) /* erts_thr_progress_pre_init(); #endif -#ifdef ERTS_ENABLE_LOCK_CHECK - erts_lc_init(); -#endif #ifdef ERTS_SMP erts_smp_atomic32_init_nob(&erts_writing_erl_crash_dump, 0L); erts_tsd_key_create(&erts_is_crash_dumping_key,"erts_is_crash_dumping_key"); diff --git a/erts/emulator/beam/erl_lock_count.c b/erts/emulator/beam/erl_lock_count.c index bd00480ba2..7eba2e34e9 100644 --- a/erts/emulator/beam/erl_lock_count.c +++ b/erts/emulator/beam/erl_lock_count.c @@ -274,11 +274,11 @@ void erts_lcnt_init() { lcnt_unlock(); - /* set start timer and zero statistics */ - erts_lcnt_clear_counters(); } void erts_lcnt_late_init() { + /* set start timer and zero statistics */ + erts_lcnt_clear_counters(); erts_thr_install_exit_handler(erts_lcnt_thread_exit_handler); } |