[Libreoffice-commits] online.git: 2 commits - net/WebSocketHandler.hpp wsd/AdminModel.cpp wsd/LOOLWSD.cpp

[Gabriel Masei (via logerrit)]

 net/WebSocketHandler.hpp |   28 ----------------------------
 wsd/AdminModel.cpp       |    2 +-
 wsd/LOOLWSD.cpp          |    2 +-
 3 files changed, 2 insertions(+), 30 deletions(-)

New commits:
commit b1e970371e289652b11648cc659b512bd45d27ed
Author:     Gabriel Masei <gabriel.masei at 1and1.ro>
AuthorDate: Wed Apr 29 14:59:03 2020 +0300
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Wed Apr 29 16:46:32 2020 +0200

    admin: fix kit CPU metrics computation
    
    Change-Id: Ib0f8411fa3919b4cffe640c13d87e1a644ed8e69
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93149
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/wsd/AdminModel.cpp b/wsd/AdminModel.cpp
index ff99578ae..e88b7aeab 100644
--- a/wsd/AdminModel.cpp
+++ b/wsd/AdminModel.cpp
@@ -941,7 +941,7 @@ struct KitProcStats
     void UpdateAggregateStats(int pid)
     {
         _threadCount.Update(Util::getStatFromPid(pid, 19));
-        _cpuTime.Update(Util::getCpuUsage(pid));
+        _cpuTime.Update(Util::getCpuUsage(pid) / sysconf (_SC_CLK_TCK));
     }
 
     int unassignedCount;
commit 1ded31fc35c436dc89e062baa6d32f14a4063930
Author:     Gabriel Masei <gabriel.masei at 1and1.ro>
AuthorDate: Tue Apr 28 20:19:36 2020 +0300
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Wed Apr 29 16:46:21 2020 +0200

    remove unused method from WebSocketHandler
    
    Change-Id: I97ff8a4606b571424b687776d51d1640b3be5209
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93096
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 9fb8682ac..5815a720e 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -546,34 +546,6 @@ public:
         return sendFrame(socket, data, len, WSFrameMask::Fin | static_cast<unsigned char>(code), flush);
     }
 
-#if !MOBILEAPP
-    /// Sends a message while giving at the same time the rights
-    /// for file descriptor to the receiving process.
-    /// DO NOT USE IT unless you have no other option.
-    int sendTextMessageWithFD(const char* msg, size_t len, int fd)
-    {
-        std::shared_ptr<StreamSocket> socket = _socket.lock();
-
-        if (!socket || msg == nullptr || len == 0)
-            return -1;
-
-        if (socket->isClosed())
-            return 0;
-
-        socket->assertCorrectThread();
-
-        std::vector<char> out;
-
-        buildFrame(msg, len, WSFrameMask::Fin | static_cast<char>(WSOpCode::Text), out);
-
-        const size_t size = out.size();
-
-        socket->sendFD(out.data(), out.size(), fd);
-
-        return size;
-    }
-#endif
-
 protected:
 
 #if !MOBILEAPP
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index dbabc5b9b..6ef3f2c84 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2072,7 +2072,7 @@ private:
         if (docBroker)
             docBroker->handleInput(data);
         else
-                LOG_WRN("Child " << child->getPid() <<
+            LOG_WRN("Child " << child->getPid() <<
                     " has no DocumentBroker to handle message: [" << abbr << "].");
     }