diff options
| author | Bernd Weimer <bernd.weimer@pelagicore.com> | 2017-02-22 18:11:18 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2017-02-22 17:27:34 +0000 |
| commit | 6bbff27316ffd5e69ccb49dbe7a3420fba7f26d3 (patch) | |
| tree | 1131fee5a1ff204d3608ef09f610c7f943f9c787 | |
| parent | 2e8b7bbfd4718b8911598c5a76fcf9bbd8f9b767 (diff) | |
| download | qtapplicationmanager-6bbff27316ffd5e69ccb49dbe7a3420fba7f26d3.tar.gz | |
Fix system memory warnings
The top-level system cgroup file "memory.limit_in_bytes" does not
reflect the actual amount of installed memory. Hence we use the value
retrieved via sysconf calls.
Change-Id: I809fd561a4460120eeaf23b8dc4484a814041ba9
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
| -rw-r--r-- | src/manager-lib/systemmonitor_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/manager-lib/systemmonitor_p.cpp b/src/manager-lib/systemmonitor_p.cpp index a875ae0d..60685fde 100644 --- a/src/manager-lib/systemmonitor_p.cpp +++ b/src/manager-lib/systemmonitor_p.cpp @@ -349,7 +349,7 @@ bool MemoryWatcher::startWatching(const QString &groupPath) hasMemoryCriticalWarning = false; m_reader.reset(new MemoryReader(groupPath)); - m_memLimit = m_reader->groupLimit(); + m_memLimit = groupPath.isEmpty() ? m_reader->totalValue() : m_reader->groupLimit(); m_threshold.reset(new MemoryThreshold({m_warning, m_critical})); connect(m_threshold.data(), &MemoryThreshold::thresholdTriggered, this, &MemoryWatcher::checkMemoryConsumption); |