loolwsd/AdminModel.cpp | 30 ++++++++++++------------------
loolwsd/AdminModel.hpp | 2 +-
loolwsd/Util.cpp | 35 +++++++++++++++++------------------
3 files changed, 30 insertions(+), 37 deletions(-)
New commits:
commit d5d31055c76a2fabd80102ae9708cbab2eac374c
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Wed Nov 9 21:12:09 2016 -0500
loolwsd: Admin formatting and cleanup
Change-Id: I0c0a9800bdd0a8ad1b652f8c5c05dc529ef04fe4
Reviewed-on: https://gerrit.libreoffice.org/30740
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loolwsd/AdminModel.cpp b/loolwsd/AdminModel.cpp
index 5142df0..d460e53 100644
--- a/loolwsd/AdminModel.cpp
+++ b/loolwsd/AdminModel.cpp
@@ -335,27 +335,21 @@ unsigned AdminModel::getTotalActiveViews()
return nTotalViews;
}
-std::string AdminModel::getDocuments()
+std::string AdminModel::getDocuments() const
{
std::ostringstream oss;
- for (auto& it: _documents)
+ for (const auto& it: _documents)
{
- if (it.second.isExpired())
- continue;
-
- const auto sPid = std::to_string(it.second.getPid());
- const auto sFilename = it.second.getFilename();
- const auto sViews = std::to_string(it.second.getActiveViews());
- const auto sMem =
std::to_string(Util::getMemoryUsage(it.second.getPid()));
- const auto sElapsed = std::to_string(it.second.getElapsedTime());
-
- std::string encodedFilename;
- Poco::URI::encode(sFilename, " ", encodedFilename);
- oss << sPid << ' '
- << encodedFilename << ' '
- << sViews << ' '
- << sMem << ' '
- << sElapsed << " \n ";
+ if (!it.second.isExpired())
+ {
+ std::string encodedFilename;
+ Poco::URI::encode(it.second.getFilename(), " ", encodedFilename);
+ oss << it.second.getPid() << ' '
+ << encodedFilename << ' '
+ << it.second.getActiveViews() << ' '
+ << Util::getMemoryUsage(it.second.getPid()) << ' '
+ << it.second.getElapsedTime() << " \n ";
+ }
}
return oss.str();
diff --git a/loolwsd/AdminModel.hpp b/loolwsd/AdminModel.hpp
index 61286b7..a1c4812 100644
--- a/loolwsd/AdminModel.hpp
+++ b/loolwsd/AdminModel.hpp
@@ -176,7 +176,7 @@ private:
unsigned getTotalActiveViews();
- std::string getDocuments();
+ std::string getDocuments() const;
private:
std::map<int, Subscriber> _subscribers;
diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index 1b9a63c..afa23f3 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -494,33 +494,32 @@ namespace Util
int getMemoryUsage(const Poco::Process::PID nPid)
{
- //TODO: Instead of RSS, return PSS
- const auto cmd = "ps o rss= -p " + std::to_string(nPid);
- FILE* fp = popen(cmd.c_str(), "r");
- if (fp == nullptr)
+ try
{
- return 0;
- }
+ //TODO: Instead of RSS, return PSS
+ const auto cmd = "ps o rss= -p " + std::to_string(nPid);
+ FILE* fp = popen(cmd.c_str(), "r");
+ if (fp == nullptr)
+ {
+ return 0;
+ }
- std::string sResponse;
- char cmdBuffer[1024];
- while (fgets(cmdBuffer, sizeof(cmdBuffer) - 1, fp) != nullptr)
- {
- sResponse += cmdBuffer;
- }
- pclose(fp);
+ std::string sResponse;
+ char cmdBuffer[1024];
+ while (fgets(cmdBuffer, sizeof(cmdBuffer) - 1, fp) != nullptr)
+ {
+ sResponse += cmdBuffer;
+ }
+ pclose(fp);
- int nMem = -1;
- try
- {
- nMem = std::stoi(sResponse);
+ return std::stoi(sResponse);
}
catch(const std::exception&)
{
Log::warn() << "Trying to find memory of invalid/dead PID " <<
nPid << Log::end;
}
- return nMem;
+ return -1;
}
std::string replace(const std::string& s, const std::string& a, const
std::string& b)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
