Make lock counter info independent of the locks being counted

This allows us to enable/disable lock counting at will, and greatly improves
the performance of erts_debug:lock_counters/1 since we no longer have to
worry about the lock counters "dying" while we're enumerating them.

OTP-14412

1 files changed, 11 insertions, 4 deletions

diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index 28019e306c..15c59109b1 100644
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -3195,15 +3195,22 @@ erts_sys_pre_init(void)
     /* After creation in parent */
     eid.thread_create_parent_func = thr_create_cleanup;
 
-    erts_thr_init(&eid);
-#ifdef ERTS_ENABLE_LOCK_CHECK
-    erts_lc_init();
+#ifdef ERTS_ENABLE_LOCK_COUNT
+    erts_lcnt_pre_thr_init();
 #endif
+
+    erts_thr_init(&eid);
+
 #ifdef ERTS_ENABLE_LOCK_COUNT
-    erts_lcnt_init();
+    erts_lcnt_post_thr_init();
 #endif
+
+#ifdef ERTS_ENABLE_LOCK_CHECK
+    erts_lc_init();
 #endif
 
+#endif /* USE_THREADS */
+
     erts_init_sys_time_sup();
 
     erts_smp_atomic_init_nob(&sys_misc_mem_sz, 0);