diff options
| author | Rickard Green <[email protected]> | 2015-05-08 17:47:27 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-05-08 17:47:27 +0200 |
| commit | cc03bb892c4ecf2344234d4f7b1b49133d782f41 (patch) | |
| tree | a68976350b73526dfe37fe4ad4384226c1652782 /erts/emulator/beam/erl_lock_check.c | |
| parent | 207346e0543143bf1aea11a93bcb24de170fc0ac (diff) | |
| parent | 9c78f149517dc02457d4c59e90bc9b03d411e28c (diff) | |
| download | otp-cc03bb892c4ecf2344234d4f7b1b49133d782f41.tar.gz otp-cc03bb892c4ecf2344234d4f7b1b49133d782f41.tar.bz2 otp-cc03bb892c4ecf2344234d4f7b1b49133d782f41.zip | |
Merge branch 'rickard/timer-optimization/OTP-12650'
* rickard/timer-optimization/OTP-12650:
Optimized timer implementation
Reusable red-black tree implementation
Conflicts:
erts/emulator/beam/erl_bif_timer.c
Diffstat (limited to 'erts/emulator/beam/erl_lock_check.c')
| -rw-r--r-- | erts/emulator/beam/erl_lock_check.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c index 261460d054..617ce84895 100644 --- a/erts/emulator/beam/erl_lock_check.c +++ b/erts/emulator/beam/erl_lock_check.c @@ -91,6 +91,7 @@ static erts_lc_lock_order_t erts_lock_order[] = { { "driver_list", NULL }, { "proc_link", "pid" }, { "proc_msgq", "pid" }, + { "proc_btm", "pid" }, { "dist_entry", "address" }, { "dist_entry_links", "address" }, { "code_write_permission", NULL }, |