diff options
| author | Rickard Green <[email protected]> | 2010-12-17 10:39:37 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2010-12-17 10:39:37 +0100 |
| commit | f4f3beb158352b23959c09f8b0dfc83013d5fdf2 (patch) | |
| tree | 6684443f968a9442d26afb6346e992466fc07c11 /erts/emulator/beam/erl_lock_check.c | |
| parent | 3e219dd7c05762fae05815db2813e765fd3b3a8f (diff) | |
| parent | 8b18824e2b13e60fb1a067f80dbb228172f6a3d2 (diff) | |
| download | otp-f4f3beb158352b23959c09f8b0dfc83013d5fdf2.tar.gz otp-f4f3beb158352b23959c09f8b0dfc83013d5fdf2.tar.bz2 otp-f4f3beb158352b23959c09f8b0dfc83013d5fdf2.zip | |
Merge branch 'rickard/ets-tab-delete/OTP-8999' into dev
* rickard/ets-tab-delete/OTP-8999:
Safe deallocation of ETS-table structures
Fix rwlock resource leak when hitting system limit
Conflicts:
erts/emulator/beam/erl_process.h
erts/emulator/beam/erl_process.c
Diffstat (limited to 'erts/emulator/beam/erl_lock_check.c')
| -rw-r--r-- | erts/emulator/beam/erl_lock_check.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c index 7a6aaa6bbe..0185baee6b 100644 --- a/erts/emulator/beam/erl_lock_check.c +++ b/erts/emulator/beam/erl_lock_check.c @@ -177,6 +177,8 @@ static erts_lc_lock_order_t erts_lock_order[] = { { "async_id", NULL }, { "pix_lock", "address" }, { "run_queues_lists", NULL }, + { "misc_aux_work_queue", "index" }, + { "misc_aux_work_pre_alloc_lock", "address" }, { "sched_stat", NULL }, { "run_queue_sleep_list", "address" }, #endif |