diff options
| author | Sverker Eriksson <[email protected]> | 2018-10-15 19:55:59 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-10-19 19:44:52 +0200 |
| commit | 1add406b90e5cff980230d3450a437d5cc88aa60 (patch) | |
| tree | 5fd698080537388ab5a2c908615627564db39d78 /erts/emulator/beam/erl_lock_check.c | |
| parent | bfacc491d99156cef23de4e99a2d3cb0965eb075 (diff) | |
| download | otp-1add406b90e5cff980230d3450a437d5cc88aa60.tar.gz otp-1add406b90e5cff980230d3450a437d5cc88aa60.tar.bz2 otp-1add406b90e5cff980230d3450a437d5cc88aa60.zip | |
erts: Remove dead tree merging code
Diffstat (limited to 'erts/emulator/beam/erl_lock_check.c')
| -rw-r--r-- | erts/emulator/beam/erl_lock_check.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c index 987e370341..018c82aabb 100644 --- a/erts/emulator/beam/erl_lock_check.c +++ b/erts/emulator/beam/erl_lock_check.c @@ -1034,11 +1034,6 @@ erts_lc_trylock_force_busy_flg(erts_lc_lock_t *lck, erts_lock_options_t options) #endif } -/* - * locked = 0 trylock failed - * locked > 0 trylock succeeded - * locked < 0 prelocking of newly created lock (no lock order check) - */ void erts_lc_trylock_flg_x(int locked, erts_lc_lock_t *lck, erts_lock_options_t options, char *file, unsigned int line) { @@ -1069,7 +1064,7 @@ void erts_lc_trylock_flg_x(int locked, erts_lc_lock_t *lck, erts_lock_options_t for (tl_lck = thr->locked.last; tl_lck; tl_lck = tl_lck->prev) { int order = compare_locked_by_id_extra(tl_lck, lck); if (order <= 0) { - if (order == 0 && locked >= 0) + if (order == 0) lock_twice("Trylocking", thr, lck, options); if (locked) { ll->next = tl_lck->next; |