summaryrefslogtreecommitdiffstats
path: root/wsd/Admin.hpp
diff options
context:
space:
mode:
authorGabriel Masei <gabriel.masei@1and1.ro>2020-04-23 13:35:42 +0300
committerMichael Meeks <michael.meeks@collabora.com>2020-04-25 09:11:35 +0200
commit6b486f229a68cf9ee1641e14c82b0de4c64b1fe2 (patch)
treed45ada718e371d5bafa09600790cf7ad6f617bba /wsd/Admin.hpp
parentAdmin: cleanup lifecycle of Document. (diff)
downloadonline-6b486f229a68cf9ee1641e14c82b0de4c64b1fe2.tar.gz
online-6b486f229a68cf9ee1641e14c82b0de4c64b1fe2.zip
wsd: admin: move kit memory reporting from kit to admin module
Sometimes kit process goes into a heavy processing state (or even hangs) and is not able to report its memory usage. Thus we can't implement cleanup of problematic kit processes based on memory information reported by kit. By moving memory reporting to admin module we avoid this problem. Change-Id: Icf274e3a3a97b33623a93f9d2dc1e640ad9b7d99 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92752 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.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/wsd/Admin.hpp b/wsd/Admin.hpp
index 32b2ebeab2..9dc015596d 100644
--- a/wsd/Admin.hpp
+++ b/wsd/Admin.hpp
@@ -108,7 +108,6 @@ public:
void rescheduleCpuTimer(unsigned interval);
void updateLastActivityTime(const std::string& docKey);
- void updateMemoryDirty(const std::string& docKey, int dirty);
void addBytes(const std::string& docKey, uint64_t sent, uint64_t recv);
void dumpState(std::ostream& os) override;
@@ -130,6 +129,7 @@ public:
void setViewLoadDuration(const std::string& docKey, const std::string& sessionId, std::chrono::milliseconds viewLoadDuration);
void setDocWopiDownloadDuration(const std::string& docKey, std::chrono::milliseconds wopiDownloadDuration);
void setDocWopiUploadDuration(const std::string& docKey, const std::chrono::milliseconds uploadDuration);
+ void setDocProcSMapsFD(const std::string& docKey, const int smapsFD);
void addSegFaultCount(unsigned segFaultCount);
void getMetrics(std::ostringstream &metrics);