diff options
| author | John Högberg <[email protected]> | 2017-07-06 12:30:45 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-07-06 12:30:45 +0200 |
| commit | 5a537ae41c2295f7f19e4e01fe90acc7585f5b30 (patch) | |
| tree | 7a27a822fa0e7a09e2259a77683ca4f2632df0b3 /erts/emulator/beam/erl_cpu_topology.c | |
| parent | 5e0019ebb29a9fd88e0b04f0bd0b0d722e3f189e (diff) | |
| parent | 876ecc058d0d7dd48f8c5f7ddaf189d278e69925 (diff) | |
| download | otp-5a537ae41c2295f7f19e4e01fe90acc7585f5b30.tar.gz otp-5a537ae41c2295f7f19e4e01fe90acc7585f5b30.tar.bz2 otp-5a537ae41c2295f7f19e4e01fe90acc7585f5b30.zip | |
Merge branch 'john/erts/runtime-lcnt' into maint
* john/erts/runtime-lcnt:
Document rt_mask and add warnings about copy_save
Add an emulator test suite for lock counting
Break erts_debug:lock_counters/1 into separate BIFs
Allow toggling lock counting at runtime
Move lock flags to a common header
Enable register_SUITE for lcnt builds
Enable lcnt smoke test on all builds that have lcnt enabled
Make lock counter info independent of the locks being counted
OTP-14412
OTP-13170
OTP-14413
Diffstat (limited to 'erts/emulator/beam/erl_cpu_topology.c')
| -rw-r--r-- | erts/emulator/beam/erl_cpu_topology.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_cpu_topology.c b/erts/emulator/beam/erl_cpu_topology.c index 50f33b2014..f8b2fa744f 100644 --- a/erts/emulator/beam/erl_cpu_topology.c +++ b/erts/emulator/beam/erl_cpu_topology.c @@ -1706,7 +1706,8 @@ erts_init_cpu_topology(void) { int ix; - erts_smp_rwmtx_init(&cpuinfo_rwmtx, "cpu_info"); + erts_smp_rwmtx_init(&cpuinfo_rwmtx, "cpu_info", NIL, + ERTS_LOCK_FLAGS_PROPERTY_STATIC | ERTS_LOCK_FLAGS_CATEGORY_GENERIC); erts_smp_rwmtx_rwlock(&cpuinfo_rwmtx); scheduler2cpu_map = erts_alloc(ERTS_ALC_T_CPUDATA, |