diff options
author | Erlang/OTP <[email protected]> | 2019-04-16 16:37:36 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2019-04-16 16:37:36 +0200 |
commit | 65391703e04624539d174cb810c2af7b23b001f6 (patch) | |
tree | 56d213504f06c618f85fb69dcf7c250ffcded285 /erts/emulator/beam/erl_db_tree.c | |
parent | a2cc71859fdb332c9d2edd0d1408a4c1d8bc5646 (diff) | |
parent | 8dec35910330a44de3fa08573e3029f10b3aa4ae (diff) | |
download | otp-65391703e04624539d174cb810c2af7b23b001f6.tar.gz otp-65391703e04624539d174cb810c2af7b23b001f6.tar.bz2 otp-65391703e04624539d174cb810c2af7b23b001f6.zip |
Merge branch 'sverker/ets-no-mbuf-trapping/OTP-15660' into maint-20
* sverker/ets-no-mbuf-trapping/OTP-15660:
erts: Remove ets traversal yielding if heap fragment
Diffstat (limited to 'erts/emulator/beam/erl_db_tree.c')
-rw-r--r-- | erts/emulator/beam/erl_db_tree.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/erts/emulator/beam/erl_db_tree.c b/erts/emulator/beam/erl_db_tree.c index 1127b8d12e..d2b0bf95bd 100644 --- a/erts/emulator/beam/erl_db_tree.c +++ b/erts/emulator/beam/erl_db_tree.c @@ -3336,13 +3336,6 @@ static int doit_select(DbTableTree *tb, TreeDbTerm *this, void *ptr, if (is_value(ret)) { sc->accum = CONS(hp, ret, sc->accum); } - if (MBUF(sc->p)) { - /* - * Force a trap and GC if a heap fragment was created. Many heap fragments - * make the GC slow. - */ - sc->max = 0; - } if (--(sc->max) <= 0) { return 0; } @@ -3399,13 +3392,6 @@ static int doit_select_chunk(DbTableTree *tb, TreeDbTerm *this, void *ptr, ++(sc->got); sc->accum = CONS(hp, ret, sc->accum); } - if (MBUF(sc->p)) { - /* - * Force a trap and GC if a heap fragment was created. Many heap fragments - * make the GC slow. - */ - sc->max = 0; - } if (--(sc->max) <= 0 || sc->got == sc->chunk_size) { return 0; } |