summaryrefslogtreecommitdiffstats
path: root/wsd/Admin.hpp
diff options
context:
space:
mode:
authorGabriel Masei <gabriel.masei@1and1.ro>2020-06-08 13:41:03 +0300
committerMichael Meeks <michael.meeks@collabora.com>2020-06-09 11:25:44 +0200
commitac17984226dac695fbd68699e168e2332f1ab9c7 (patch)
tree5c6bdd0fb4469b2fbb85853420b295a23d10beb7 /wsd/Admin.hpp
parentMobile: Add world count icon to the hamburger menu (diff)
downloadonline-ac17984226dac695fbd68699e168e2332f1ab9c7.tar.gz
online-ac17984226dac695fbd68699e168e2332f1ab9c7.zip
admin: cleanup resource consuming kits
Change-Id: Ifafbadc61b788adc90c03fb92e0231f9e599c360 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95794 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'wsd/Admin.hpp')
-rw-r--r--wsd/Admin.hpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/wsd/Admin.hpp b/wsd/Admin.hpp
index 5a3feee61e..f9532c59f3 100644
--- a/wsd/Admin.hpp
+++ b/wsd/Admin.hpp
@@ -124,6 +124,8 @@ public:
void setDefDocProcSettings(const DocProcSettings& docProcSettings, bool notifyKit)
{
_defDocProcSettings = docProcSettings;
+ _model.setDefDocProcSettings(docProcSettings);
+ _cleanupIntervalMs = _defDocProcSettings.getCleanupSettings().getCleanupInterval();
if (notifyKit)
notifyForkit();
}
@@ -149,6 +151,7 @@ private:
/// under @hardModeLimit
void triggerMemoryCleanup(size_t hardModeLimit);
void notifyDocsMemDirtyChanged();
+ void cleanupResourceConsumingDocs();
/// Round the interval up to multiples of MinStatsIntervalMs.
/// This is to avoid arbitrarily small intervals that hammer the server.
@@ -190,6 +193,7 @@ private:
int _cpuStatsTaskIntervalMs;
int _memStatsTaskIntervalMs;
int _netStatsTaskIntervalMs;
+ size_t _cleanupIntervalMs;
DocProcSettings _defDocProcSettings;
// Don't update any more frequently than this since it's excessive.