Changeset: c5fce2eebeef for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c5fce2eebeef Modified Files: gdk/gdk_utils.c Branch: default Log Message:
Backing out 997b2bd65f60, 0d7e76772b26, 3de9207729b5, 8d685562e4ad, 34eb3d576d9f. This is the wrong solution to whatever problem this was supposed to solve. diffs (21 lines): diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c --- a/gdk/gdk_utils.c +++ b/gdk/gdk_utils.c @@ -919,15 +919,8 @@ GDKvmtrim(void *limit) MEMDEBUG THRprintf(GDKstdout, "alloc = " SZFMT " %+zd rss = " SZFMT " %+zd\n", cursize, memdiff, rss, rssdiff); prevmem = cursize; prevrss = rss; - //OLD:if (memdiff >= 0 && rssdiff < -32 * (ssize_t) MT_pagesize()) { - // Using a small fixed sized highwatermark on a 256G RAM machine - // turns out to call BBPtrim too often/unnecessary - // The new decision is aligned with MAL-Admission, where we start - // worrying after 80% of the memory is claimed - // At that stage we try to reduce the minimum needed to get back on safe grounds. - if (rss > 0.8 * MT_npages() * MT_pagesize()) { - BBPtrim((size_t)(rss - 0.8 * MT_npages() * MT_pagesize())); - //BBPtrim(rss); + if (memdiff >= 0 && rssdiff < -32 * (ssize_t) MT_pagesize()) { + BBPtrim(rss); highload = 1; } else { highload = 0; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list