wsd/Admin.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b9c55868d21b3c10437c8f33ef8c7419b9f63ef9
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Jul 11 17:48:21 2017 +0530
This is percentage of total sys memory, not total consumed memory
Change-Id: I16b8b3d217cd0fabed83a9c63a5966cc6fe4d8fb
(cherry picked from commit ccce64eeeffce4ebef4f3cf7bde6ab288c6a1989)
Reviewed-on: https://gerrit.libreoffice.org/39819
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index 79371720..9d673906 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -466,7 +466,7 @@ void Admin::triggerMemoryCleanup(size_t totalMem)
float memToFreePercentage = 0;
if ( (memToFreePercentage = (totalMem/static_cast<double>(_totalSysMem)) -
memLimit/100.) > 0.0 )
{
- int memToFree = memToFreePercentage * totalMem;
+ int memToFree = memToFreePercentage * _totalSysMem;
LOG_TRC("Memory to be freed (in kB) : " << memToFree);
// prepare document list sorted by most idle times
std::list<DocBasicInfo> docList = _model.getDocumentsSortedByIdle();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
