diff options
| author | Sverker Eriksson <[email protected]> | 2019-03-07 20:48:02 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-03-07 20:48:02 +0100 |
| commit | 8e323b5c6cbc2ffc8f8f8883daaaf419144c35f1 (patch) | |
| tree | d6abeb81266f833e781ac7af28fdf6157cef789a /erts/emulator/beam/erl_db_hash.c | |
| parent | 1e05aaf67fdf7547d72e20ff5a272ad8912f9ae0 (diff) | |
| parent | 8dec35910330a44de3fa08573e3029f10b3aa4ae (diff) | |
| download | otp-8e323b5c6cbc2ffc8f8f8883daaaf419144c35f1.tar.gz otp-8e323b5c6cbc2ffc8f8f8883daaaf419144c35f1.tar.bz2 otp-8e323b5c6cbc2ffc8f8f8883daaaf419144c35f1.zip | |
Merge branch 'sverker/ets-no-mbuf-trapping/OTP-15660'
into sverker/maint/ets-no-mbuf-trapping/OTP-15660
Diffstat (limited to 'erts/emulator/beam/erl_db_hash.c')
| -rw-r--r-- | erts/emulator/beam/erl_db_hash.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/erts/emulator/beam/erl_db_hash.c b/erts/emulator/beam/erl_db_hash.c index 752d3ae3a8..42d7909a08 100644 --- a/erts/emulator/beam/erl_db_hash.c +++ b/erts/emulator/beam/erl_db_hash.c @@ -1323,11 +1323,7 @@ static int match_traverse(Process* p, DbTableHash* tb, unlock_hash_function(lck); break; } - if (iterations_left <= 0 || MBUF(p)) { - /* - * We have either reached our limit, or just created some heap fragments. - * Since many heap fragments will make the GC slower, trap and GC now. - */ + if (iterations_left <= 0) { unlock_hash_function(lck); ret_value = ctx->on_trap(ctx, slot_ix, got, &mpi.mp, ret); goto done; @@ -1433,11 +1429,7 @@ static int match_traverse_continue(Process* p, DbTableHash* tb, unlock_hash_function(lck); break; } - if (iterations_left <= 0 || MBUF(p)) { - /* - * We have either reached our limit, or just created some heap fragments. - * Since many heap fragments will make the GC slower, trap and GC now. - */ + if (iterations_left <= 0) { unlock_hash_function(lck); ret_value = ctx->on_trap(ctx, slot_ix, got, mpp, ret); goto done; |