[Libreoffice-commits] online.git: wsd/Admin.cpp wsd/AdminModel.hpp wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

 wsd/Admin.cpp      |   24 ++++++++++++------------
 wsd/AdminModel.hpp |   19 ++++++++++++++-----
 wsd/LOOLWSD.cpp    |   16 ++++++++--------
 3 files changed, 34 insertions(+), 25 deletions(-)

New commits:
commit d00c6382986249fcc9dc2bc97b2ed59ba151babc
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Jan 8 09:05:40 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Jan 8 09:05:46 2019 +0100

    DocProcSettings: make members private
    
    Which shows that LimitDataMemKb was an unused member, so remove it.
    
    Change-Id: I48c9a5df09b78e5fc267550219d7f4c78a03ec01

diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index 7efc46331..8cb2aa389 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -183,10 +183,10 @@ void AdminSocketHandler::handleMessage(bool /* fin */, WSOpCode /* code */,
             << "net_stats_interval=" << std::to_string(_admin->getNetStatsInterval()) << ' ';
 
         const DocProcSettings& docProcSettings = _admin->getDefDocProcSettings();
-        oss << "limit_virt_mem_mb=" << docProcSettings.LimitVirtMemMb << ' '
-            << "limit_stack_mem_kb=" << docProcSettings.LimitStackMemKb << ' '
-            << "limit_file_size_mb=" << docProcSettings.LimitFileSizeMb << ' '
-            << "limit_num_open_files=" << docProcSettings.LimitNumberOpenFiles << ' ';
+        oss << "limit_virt_mem_mb=" << docProcSettings.getLimitVirtMemMb() << ' '
+            << "limit_stack_mem_kb=" << docProcSettings.getLimitStackMemKb() << ' '
+            << "limit_file_size_mb=" << docProcSettings.getLimitFileSizeMb() << ' '
+            << "limit_num_open_files=" << docProcSettings.getLimitNumberOpenFiles() << ' ';
 
         sendTextFrame(oss.str());
     }
@@ -251,13 +251,13 @@ void AdminSocketHandler::handleMessage(bool /* fin */, WSOpCode /* code */,
             {
                 DocProcSettings docProcSettings = _admin->getDefDocProcSettings();
                 if (settingName == "limit_virt_mem_mb")
-                    docProcSettings.LimitVirtMemMb = settingVal;
+                    docProcSettings.setLimitVirtMemMb(settingVal);
                 else if (settingName == "limit_stack_mem_kb")
-                    docProcSettings.LimitStackMemKb = settingVal;
+                    docProcSettings.setLimitStackMemKb(settingVal);
                 else if (settingName == "limit_file_size_mb")
-                    docProcSettings.LimitFileSizeMb = settingVal;
+                    docProcSettings.setLimitFileSizeMb(settingVal);
                 else if (settingName == "limit_num_open_files")
-                    docProcSettings.LimitNumberOpenFiles = settingVal;
+                    docProcSettings.setLimitNumberOpenFiles(settingVal);
                 else
                     LOG_ERR("Unknown limit: " << settingName);
 
@@ -572,10 +572,10 @@ void Admin::addBytes(const std::string& docKey, uint64_t sent, uint64_t recv)
 void Admin::notifyForkit()
 {
     std::ostringstream oss;
-    oss << "setconfig limit_virt_mem_mb " << _defDocProcSettings.LimitVirtMemMb << '\n'
-        << "setconfig limit_stack_mem_kb " << _defDocProcSettings.LimitStackMemKb << '\n'
-        << "setconfig limit_file_size_mb " << _defDocProcSettings.LimitFileSizeMb << '\n'
-        << "setconfig limit_num_open_files " << _defDocProcSettings.LimitNumberOpenFiles << '\n';
+    oss << "setconfig limit_virt_mem_mb " << _defDocProcSettings.getLimitVirtMemMb() << '\n'
+        << "setconfig limit_stack_mem_kb " << _defDocProcSettings.getLimitStackMemKb() << '\n'
+        << "setconfig limit_file_size_mb " << _defDocProcSettings.getLimitFileSizeMb() << '\n'
+        << "setconfig limit_num_open_files " << _defDocProcSettings.getLimitNumberOpenFiles() << '\n';
 
     if (_forKitWritePipe != -1)
         IoUtil::writeToPipe(_forKitWritePipe, oss.str());
diff --git a/wsd/AdminModel.hpp b/wsd/AdminModel.hpp
index 86c68df33..2b69f900b 100644
--- a/wsd/AdminModel.hpp
+++ b/wsd/AdminModel.hpp
@@ -48,11 +48,20 @@ private:
 
 struct DocProcSettings
 {
-    size_t LimitVirtMemMb;
-    size_t LimitDataMemKb;
-    size_t LimitStackMemKb;
-    size_t LimitFileSizeMb;
-    size_t LimitNumberOpenFiles;
+    void setLimitVirtMemMb(size_t limitVirtMemMb) { _limitVirtMemMb = limitVirtMemMb; }
+    size_t getLimitVirtMemMb() const { return _limitVirtMemMb; }
+    void setLimitStackMemKb(size_t limitStackMemKb) { _limitStackMemKb = limitStackMemKb; }
+    size_t getLimitStackMemKb() const { return _limitStackMemKb; }
+    void setLimitFileSizeMb(size_t limitFileSizeMb) { _limitFileSizeMb = limitFileSizeMb; }
+    size_t getLimitFileSizeMb() const { return _limitFileSizeMb; }
+    void setLimitNumberOpenFiles(size_t limitNumberOpenFiles) { _limitNumberOpenFiles = limitNumberOpenFiles; }
+    size_t getLimitNumberOpenFiles() const { return _limitNumberOpenFiles; }
+
+private:
+    size_t _limitVirtMemMb;
+    size_t _limitStackMemKb;
+    size_t _limitFileSizeMb;
+    size_t _limitNumberOpenFiles;
 };
 
 /// Containing basic information about document
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index f43aca9c5..30beb7b28 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1137,10 +1137,10 @@ void LOOLWSD::initialize(Application& self)
     ServerApplication::initialize(self);
 
     DocProcSettings docProcSettings;
-    docProcSettings.LimitVirtMemMb = getConfigValue<int>("per_document.limit_virt_mem_mb", 0);
-    docProcSettings.LimitStackMemKb = getConfigValue<int>("per_document.limit_stack_mem_kb", 0);
-    docProcSettings.LimitFileSizeMb = getConfigValue<int>("per_document.limit_file_size_mb", 0);
-    docProcSettings.LimitNumberOpenFiles = getConfigValue<int>("per_document.limit_num_open_files", 0);
+    docProcSettings.setLimitVirtMemMb(getConfigValue<int>("per_document.limit_virt_mem_mb", 0));
+    docProcSettings.setLimitStackMemKb(getConfigValue<int>("per_document.limit_stack_mem_kb", 0));
+    docProcSettings.setLimitFileSizeMb(getConfigValue<int>("per_document.limit_file_size_mb", 0));
+    docProcSettings.setLimitNumberOpenFiles(getConfigValue<int>("per_document.limit_num_open_files", 0));
     Admin::instance().setDefDocProcSettings(docProcSettings, false);
 
 #if ENABLE_DEBUG
@@ -1558,10 +1558,10 @@ bool LOOLWSD::createForKit()
 
     const DocProcSettings& docProcSettings = Admin::instance().getDefDocProcSettings();
     std::ostringstream ossRLimits;
-    ossRLimits << "limit_virt_mem_mb:" << docProcSettings.LimitVirtMemMb;
-    ossRLimits << ";limit_stack_mem_kb:" << docProcSettings.LimitStackMemKb;
-    ossRLimits << ";limit_file_size_mb:" << docProcSettings.LimitFileSizeMb;
-    ossRLimits << ";limit_num_open_files:" << docProcSettings.LimitNumberOpenFiles;
+    ossRLimits << "limit_virt_mem_mb:" << docProcSettings.getLimitVirtMemMb();
+    ossRLimits << ";limit_stack_mem_kb:" << docProcSettings.getLimitStackMemKb();
+    ossRLimits << ";limit_file_size_mb:" << docProcSettings.getLimitFileSizeMb();
+    ossRLimits << ";limit_num_open_files:" << docProcSettings.getLimitNumberOpenFiles();
     args.push_back("--rlimits=" + ossRLimits.str());
 
     if (UnitWSD::get().hasKitHooks())