loolwsd/Admin.cpp | 8 ++++---- loolwsd/Admin.hpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 2563b3c8486ca1847e34c6e41b84b1d9ccbd1ce1 Author: Miklos Vajna <[email protected]> Date: Mon Mar 21 08:57:03 2016 +0100 loolwsd: add missing prefix in Admin diff --git a/loolwsd/Admin.cpp b/loolwsd/Admin.cpp index 445af45..a1c11cc 100644 --- a/loolwsd/Admin.cpp +++ b/loolwsd/Admin.cpp @@ -68,7 +68,7 @@ public: auto ws = std::make_shared<WebSocket>(request, response); { - std::lock_guard<std::mutex> modelLock(_admin->modelMutex); + std::lock_guard<std::mutex> modelLock(_admin->_modelMutex); // Subscribe the websocket of any AdminModel updates AdminModel& model = _admin->getModel(); model.subscribe(nSessionId, ws); @@ -124,7 +124,7 @@ public: continue; // Lock the model mutex before interacting with it - std::lock_guard<std::mutex> modelLock(_admin->modelMutex); + std::lock_guard<std::mutex> modelLock(_admin->_modelMutex); AdminModel& model = _admin->getModel(); if (tokens[0] == "stats") @@ -370,13 +370,13 @@ Admin::~Admin() void Admin::handleInput(std::string& message) { - std::lock_guard<std::mutex> modelLock(modelMutex); + std::lock_guard<std::mutex> modelLock(_modelMutex); _model.update(message); } void MemoryStats::run() { - std::lock_guard<std::mutex> modelLock(_admin->modelMutex); + std::lock_guard<std::mutex> modelLock(_admin->_modelMutex); AdminModel& model = _admin->getModel(); unsigned totalMem = _admin->getTotalMemoryUsage(model); diff --git a/loolwsd/Admin.hpp b/loolwsd/Admin.hpp index c99d079..8da9839 100644 --- a/loolwsd/Admin.hpp +++ b/loolwsd/Admin.hpp @@ -48,7 +48,7 @@ public: void rescheduleCpuTimer(unsigned interval); public: - std::mutex modelMutex; + std::mutex _modelMutex; private: void handleInput(std::string& message); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
