lok: trim glibc allocator's pending heap when called.
Change-Id: I8d1bda01a0e6ccff0fa868013c67c0fbbf78a836 Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150299 Tested-by: Jenkins
This commit is contained in:
@@ -26,8 +26,14 @@
|
||||
#include <postmac.h>
|
||||
#endif
|
||||
|
||||
#undef HAVE_MALLOC_TRIM
|
||||
|
||||
#ifdef LINUX
|
||||
#include <fcntl.h>
|
||||
#if defined __GLIBC__
|
||||
# include <malloc.h>
|
||||
# define HAVE_MALLOC_TRIM
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef ANDROID
|
||||
@@ -3146,6 +3152,12 @@ static char* lo_extractRequest(LibreOfficeKit* /*pThis*/, const char* pFilePath)
|
||||
static void lo_trimMemory(LibreOfficeKit* /* pThis */, int nTarget)
|
||||
{
|
||||
vcl::lok::trimMemory(nTarget);
|
||||
if (nTarget > 1000)
|
||||
{
|
||||
#ifdef HAVE_MALLOC_TRIM
|
||||
malloc_trim(0);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
static void lo_registerCallback (LibreOfficeKit* pThis,
|
||||
|
||||
Reference in New Issue
Block a user