diff options
| author | Rickard Green <[email protected]> | 2018-03-23 14:12:52 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-03-23 14:12:52 +0100 |
| commit | 5c2acbd35150da5e6d3afba1f61bb8bb995bb80f (patch) | |
| tree | 9250351fba7a64b5b1f9ff11fff7da8563ec3155 /erts/emulator/beam/erl_node_tables.c | |
| parent | be2bdf8c8c0bd3d110277fcbe8dc3611163087cc (diff) | |
| parent | 83a289d4dff156f2c7203843a1437256545f5580 (diff) | |
| download | otp-5c2acbd35150da5e6d3afba1f61bb8bb995bb80f.tar.gz otp-5c2acbd35150da5e6d3afba1f61bb8bb995bb80f.tar.bz2 otp-5c2acbd35150da5e6d3afba1f61bb8bb995bb80f.zip | |
Merge branch 'rickard/signals/OTP-14589'
* rickard/signals/OTP-14589:
Fix VM probes compilation
Fix lock counting
Fix signal order for is_process_alive
Fix signal handling priority elevation
Diffstat (limited to 'erts/emulator/beam/erl_node_tables.c')
| -rw-r--r-- | erts/emulator/beam/erl_node_tables.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_node_tables.c b/erts/emulator/beam/erl_node_tables.c index ca83e70046..1f147011a8 100644 --- a/erts/emulator/beam/erl_node_tables.c +++ b/erts/emulator/beam/erl_node_tables.c @@ -1051,14 +1051,16 @@ static void erts_lcnt_enable_dist_lock_count(void *dep_raw, void *enable) { if(enable) { erts_lcnt_install_new_lock_info(&dep->rwmtx.lcnt, "dist_entry", dep->sysname, ERTS_LOCK_TYPE_RWMUTEX | ERTS_LOCK_FLAGS_CATEGORY_DISTRIBUTION); - erts_lcnt_install_new_lock_info(&dep->lnk_mtx.lcnt, "dist_entry_links", dep->sysname, - ERTS_LOCK_TYPE_MUTEX | ERTS_LOCK_FLAGS_CATEGORY_DISTRIBUTION); erts_lcnt_install_new_lock_info(&dep->qlock.lcnt, "dist_entry_out_queue", dep->sysname, ERTS_LOCK_TYPE_MUTEX | ERTS_LOCK_FLAGS_CATEGORY_DISTRIBUTION); + if (dep->mld) + erts_lcnt_install_new_lock_info(&dep->mld->mtx.lcnt, "dist_entry_links", dep->sysname, + ERTS_LOCK_TYPE_MUTEX | ERTS_LOCK_FLAGS_CATEGORY_DISTRIBUTION); } else { erts_lcnt_uninstall(&dep->rwmtx.lcnt); - erts_lcnt_uninstall(&dep->lnk_mtx.lcnt); erts_lcnt_uninstall(&dep->qlock.lcnt); + if (dep->mld) + erts_lcnt_uninstall(&dep->mld->mtx.lcnt); } } |