aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_db_tree.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2019-03-07 21:00:44 +0100
committerSverker Eriksson <[email protected]>2019-03-07 21:00:44 +0100
commit397bb89701a1113125baf1adbaa16a50612cfadb (patch)
tree99d8a25b725e50d7deb9332093f28c4c50b1e3d5 /erts/emulator/beam/erl_db_tree.c
parentc70a0aaeacd91d525c59f9a376022cb87d18e87a (diff)
parent8e323b5c6cbc2ffc8f8f8883daaaf419144c35f1 (diff)
downloadotp-397bb89701a1113125baf1adbaa16a50612cfadb.tar.gz
otp-397bb89701a1113125baf1adbaa16a50612cfadb.tar.bz2
otp-397bb89701a1113125baf1adbaa16a50612cfadb.zip
Merge branch 'sverker/maint/ets-no-mbuf-trapping/OTP-15660'
into sverker/master/ets-no-mbuf-trapping/OTP-15660
Diffstat (limited to 'erts/emulator/beam/erl_db_tree.c')
-rw-r--r--erts/emulator/beam/erl_db_tree.c14
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 02a5934a6e..fe57348700 100644
--- a/erts/emulator/beam/erl_db_tree.c
+++ b/erts/emulator/beam/erl_db_tree.c
@@ -3743,13 +3743,6 @@ static int doit_select(DbTableCommon *tb, TreeDbTerm *this,
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;
}
@@ -3806,13 +3799,6 @@ static int doit_select_chunk(DbTableCommon *tb, TreeDbTerm *this,
++(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;
}