[Libreoffice-commits] online.git: 2 commits - kit/Kit.cpp wsd/Admin.cpp wsd/Admin.hpp
Ashod Nakashian
ashod.nakashian at collabora.co.uk
Sun Feb 11 21:17:08 UTC 2018
kit/Kit.cpp | 13 ++++++-------
wsd/Admin.cpp | 56 ++++++++++++++++++++++++++++++--------------------------
wsd/Admin.hpp | 15 ++++++++++++---
3 files changed, 48 insertions(+), 36 deletions(-)
New commits:
commit b834545e79b6fd7ec11de22c6b8af1a214431168
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date: Sun Feb 11 15:40:28 2018 -0500
kit: makeRenderParams now static
Change-Id: I1c79991a73044a91ed9f8389e23ccffd8b2bcbce
Reviewed-on: https://gerrit.libreoffice.org/49572
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 6ba238b5..d0e068d2 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1615,7 +1615,7 @@ private:
LOG_TRC("View to url [" << uri << "] created.");
}
- const std::string renderParams = makeRenderParams(userName);
+ const std::string renderParams = makeRenderParams(_renderOpts, userName);
LOG_INF("Initializing for rendering session [" << sessionId << "] on document url [" <<
_url << "] with: [" << renderParams << "].");
@@ -1714,15 +1714,15 @@ private:
return false;
}
- std::string makeRenderParams(const std::string& userName)
+ static std::string makeRenderParams(const std::string& renderOpts, const std::string& userName)
{
Object::Ptr renderOptsObj;
// Fill the object with renderoptions, if any
- if (!_renderOpts.empty())
+ if (!renderOpts.empty())
{
Parser parser;
- Poco::Dynamic::Var var = parser.parse(_renderOpts);
+ Poco::Dynamic::Var var = parser.parse(renderOpts);
renderOptsObj = var.extract<Object::Ptr>();
}
else if (!userName.empty())
@@ -1741,15 +1741,14 @@ private:
renderOptsObj->set(".uno:Author", authorObj);
}
- std::string renderParams;
if (renderOptsObj)
{
std::ostringstream ossRenderOpts;
renderOptsObj->stringify(ossRenderOpts);
- renderParams = ossRenderOpts.str();
+ return ossRenderOpts.str();
}
- return renderParams;
+ return std::string();
}
void run() override
commit 88619a323ffcd654432debf14b679f6d23bbb736
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date: Sun Feb 11 15:28:19 2018 -0500
wsd: reduce memory load only when the footprint changes
Update the network interval when updating the memory interval,
since we currently don't support changing the network interval.
Also make the default memory and network interval twice
that of the cpu interval explicitly.
Reduce logging noise a bit without losing information.
And some const-correctness and other cleanups.
Change-Id: I313fb2882675f560091e5113dbdcbdef269828e2
Reviewed-on: https://gerrit.libreoffice.org/49571
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index 74b7542f..8add6956 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -333,9 +333,9 @@ Admin::Admin() :
_lastJiffies(0),
_lastSentCount(0),
_lastRecvCount(0),
- _memStatsTaskIntervalMs(5000),
- _cpuStatsTaskIntervalMs(2000),
- _networkStatsIntervalMs(5000)
+ _cpuStatsTaskIntervalMs(DefStatsIntervalMs),
+ _memStatsTaskIntervalMs(DefStatsIntervalMs * 2),
+ _netStatsTaskIntervalMs(DefStatsIntervalMs * 2)
{
LOG_INF("Admin ctor.");
@@ -371,18 +371,18 @@ void Admin::pollingThread()
while (!_stop && !TerminationFlag && !ShutdownRequestFlag)
{
- std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
+ const std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
int cpuWait = _cpuStatsTaskIntervalMs -
std::chrono::duration_cast<std::chrono::milliseconds>(now - lastCPU).count();
if (cpuWait <= MinStatsIntervalMs / 2) // Close enough
{
const size_t currentJiffies = getTotalCpuUsage();
- size_t cpuPercent = 100 * 1000 * currentJiffies / (sysconf (_SC_CLK_TCK) * _cpuStatsTaskIntervalMs);
+ const size_t cpuPercent = 100 * 1000 * currentJiffies / (sysconf (_SC_CLK_TCK) * _cpuStatsTaskIntervalMs);
_model.addCpuStats(cpuPercent);
- lastCPU = now;
cpuWait += _cpuStatsTaskIntervalMs;
+ lastCPU = now;
}
int memWait = _memStatsTaskIntervalMs -
@@ -390,41 +390,43 @@ void Admin::pollingThread()
if (memWait <= MinStatsIntervalMs / 2) // Close enough
{
const size_t totalMem = getTotalMemoryUsage();
+ _model.addMemStats(totalMem);
+
if (totalMem != _lastTotalMemory)
{
- LOG_TRC("Total memory used: " << totalMem << " KB.");
+ // If our total memory consumption is above limit, cleanup
+ triggerMemoryCleanup(totalMem);
+
_lastTotalMemory = totalMem;
}
- _model.addMemStats(totalMem);
-
- lastMem = now;
memWait += _memStatsTaskIntervalMs;
-
- // If our total memory consumption is above limit, cleanup
- triggerMemoryCleanup(totalMem);
+ lastMem = now;
}
- int netWait = _networkStatsIntervalMs -
+ int netWait = _netStatsTaskIntervalMs -
std::chrono::duration_cast<std::chrono::milliseconds>(now - lastNet).count();
if (netWait <= MinStatsIntervalMs / 2) // Close enough
{
- uint64_t sentCount = _model.getSentBytesTotal();
- uint64_t recvCount = _model.getRecvBytesTotal();
+ const uint64_t sentCount = _model.getSentBytesTotal();
+ const uint64_t recvCount = _model.getRecvBytesTotal();
_model.addSentStats(sentCount - _lastSentCount);
_model.addRecvStats(recvCount - _lastRecvCount);
- LOG_TRC("Total Data sent: " << sentCount << ", recv: " << recvCount);
- _lastRecvCount = recvCount;
- _lastSentCount = sentCount;
+ if (_lastRecvCount != recvCount || _lastSentCount != sentCount)
+ {
+ LOG_TRC("Total Data sent: " << sentCount << ", recv: " << recvCount);
+ _lastRecvCount = recvCount;
+ _lastSentCount = sentCount;
+ }
+ netWait += _netStatsTaskIntervalMs;
lastNet = now;
- netWait += _networkStatsIntervalMs;
}
// Handle websockets & other work.
- const int timeout = std::max(std::min(std::min(cpuWait, memWait), netWait), MinStatsIntervalMs);
+ const int timeout = capAndRoundInterval(std::min(std::min(cpuWait, memWait), netWait));
LOG_TRC("Admin poll for " << timeout << "ms.");
poll(timeout);
}
@@ -453,14 +455,16 @@ void Admin::rmDoc(const std::string& docKey)
void Admin::rescheduleMemTimer(unsigned interval)
{
- _memStatsTaskIntervalMs = std::max<int>(interval, MinStatsIntervalMs);
+ _memStatsTaskIntervalMs = capAndRoundInterval(interval);
LOG_INF("Memory stats interval changed - New interval: " << _memStatsTaskIntervalMs);
+ _netStatsTaskIntervalMs = capAndRoundInterval(interval); // Until we support modifying this.
+ LOG_INF("Network stats interval changed - New interval: " << _netStatsTaskIntervalMs);
wakeup();
}
void Admin::rescheduleCpuTimer(unsigned interval)
{
- _cpuStatsTaskIntervalMs = std::max<int>(interval, MinStatsIntervalMs);
+ _cpuStatsTaskIntervalMs = capAndRoundInterval(interval);
LOG_INF("CPU stats interval changed - New interval: " << _cpuStatsTaskIntervalMs);
wakeup();
}
@@ -485,7 +489,7 @@ size_t Admin::getTotalCpuUsage()
const size_t wsdJ = Util::getCpuUsage(Poco::Process::id());
const size_t kitsJ = _model.getKitsJiffies();
- if(_lastJiffies == 0)
+ if (_lastJiffies == 0)
{
_lastJiffies = forkitJ + wsdJ;
return 0;
@@ -509,7 +513,7 @@ unsigned Admin::getCpuStatsInterval()
unsigned Admin::getNetStatsInterval()
{
- return _networkStatsIntervalMs;
+ return _netStatsTaskIntervalMs;
}
AdminModel& Admin::getModel()
@@ -546,7 +550,7 @@ void Admin::notifyForkit()
LOG_INF("Forkit write pipe not set (yet).");
}
-void Admin::triggerMemoryCleanup(size_t totalMem)
+void Admin::triggerMemoryCleanup(const size_t totalMem)
{
// Trigger mem cleanup when we are consuming too much memory (as configured by sysadmin)
const auto memLimit = LOOLWSD::getConfigValue<double>("memproportion", 0.0);
diff --git a/wsd/Admin.hpp b/wsd/Admin.hpp
index 649f0661..e3386952 100644
--- a/wsd/Admin.hpp
+++ b/wsd/Admin.hpp
@@ -126,6 +126,14 @@ private:
/// under @hardModeLimit
void triggerMemoryCleanup(size_t hardModeLimit);
+ /// Round the interval up to multiples of MinStatsIntervalMs.
+ /// This is to avoid arbitrarily small intervals that hammer the server.
+ static int capAndRoundInterval(const unsigned interval)
+ {
+ const int value = std::max<int>(interval, MinStatsIntervalMs);
+ return ((value + MinStatsIntervalMs - 1) / MinStatsIntervalMs) * MinStatsIntervalMs;
+ }
+
private:
/// The model is accessed only during startup & in
/// the Admin Poll thread.
@@ -139,13 +147,14 @@ private:
size_t _totalSysMemKb;
size_t _totalAvailMemKb;
- std::atomic<int> _memStatsTaskIntervalMs;
std::atomic<int> _cpuStatsTaskIntervalMs;
- std::atomic<int> _networkStatsIntervalMs;
+ std::atomic<int> _memStatsTaskIntervalMs;
+ std::atomic<int> _netStatsTaskIntervalMs;
DocProcSettings _defDocProcSettings;
// Don't update any more frequently than this since it's excessive.
- const int MinStatsIntervalMs = 50;
+ static const int MinStatsIntervalMs = 50;
+ static const int DefStatsIntervalMs = 2500;
};
#endif
More information about the Libreoffice-commits
mailing list