loolwsd/.gitignore | 5 ----- loolwsd/LOOLSession.cpp | 1 - loolwsd/LOOLWSD.cpp | 1 + loolwsd/MasterProcessSession.cpp | 2 -- loolwsd/MasterProcessSession.hpp | 9 --------- loolwsd/PROBLEMS | 12 ------------ 6 files changed, 1 insertion(+), 29 deletions(-)
New commits: commit ec1ae85ddbd577a1d58064e9438c2594e8c86507 Author: Tor Lillqvist <[email protected]> Date: Sun Apr 10 09:40:28 2016 +0300 Bin some obsolete lines diff --git a/loolwsd/.gitignore b/loolwsd/.gitignore index fa27586..29a8d6d 100644 --- a/loolwsd/.gitignore +++ b/loolwsd/.gitignore @@ -41,8 +41,3 @@ loolforkit loolmount loolmap loolmount -looltool -sockettransporttest - -# Debug output -/FOO*.png commit 14097022820d6939ef23f636e8a43adb08cb251d Author: Tor Lillqvist <[email protected]> Date: Sun Apr 10 09:37:51 2016 +0300 Do include what you use even if it apparently gets included indirectly anyway diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index 34291f8..0ff7e5d 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -24,6 +24,7 @@ #include <time.h> #include <cassert> +#include <condition_variable> #include <cstdlib> #include <cstring> #include <iostream> commit df2048c895188558315f578db659a41c6055aa33 Author: Tor Lillqvist <[email protected]> Date: Sun Apr 10 09:36:36 2016 +0300 No need for <condition_variable> here diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp index 1fd268c..d4062bd 100644 --- a/loolwsd/LOOLSession.cpp +++ b/loolwsd/LOOLSession.cpp @@ -14,7 +14,6 @@ #include <utime.h> #include <cassert> -#include <condition_variable> #include <cstring> #include <fstream> #include <iostream> commit 8bd0cb7543de29a7cc3937338efbd261537a42e5 Author: Tor Lillqvist <[email protected]> Date: Sun Apr 10 09:33:03 2016 +0300 These member variables are not used any more diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp index 71ffe79..93aa859 100644 --- a/loolwsd/MasterProcessSession.cpp +++ b/loolwsd/MasterProcessSession.cpp @@ -35,8 +35,6 @@ MasterProcessSession::MasterProcessSession(const std::string& id, std::shared_ptr<DocumentBroker> docBroker, std::shared_ptr<BasicTileQueue> queue) : LOOLSession(id, kind, ws), - _idleSaveTime(0), - _autoSaveTime(0), _curPart(0), _loadPart(-1), _docBroker(docBroker), diff --git a/loolwsd/MasterProcessSession.hpp b/loolwsd/MasterProcessSession.hpp index c7f0648..04d671d 100644 --- a/loolwsd/MasterProcessSession.hpp +++ b/loolwsd/MasterProcessSession.hpp @@ -56,9 +56,6 @@ class MasterProcessSession final : public LOOLSession, public std::enable_shared bool isEditLocked() const { return _bEditLock; } public: - time_t _idleSaveTime; - time_t _autoSaveTime; - // Raise this flag on ToClient from ToPrisoner to let ToClient know of load failures bool _bLoadError = false; commit 3717c0ed27b31afcbb1c700f4381b2d64fb32269 Author: Tor Lillqvist <[email protected]> Date: Sun Apr 10 09:31:56 2016 +0300 Bin some unused static member variables diff --git a/loolwsd/MasterProcessSession.hpp b/loolwsd/MasterProcessSession.hpp index e1422fc..c7f0648 100644 --- a/loolwsd/MasterProcessSession.hpp +++ b/loolwsd/MasterProcessSession.hpp @@ -56,12 +56,6 @@ class MasterProcessSession final : public LOOLSession, public std::enable_shared bool isEditLocked() const { return _bEditLock; } public: - // Sessions to pre-spawned child processes that have connected but are not yet assigned a - // document to work on. - static std::map<std::string, std::shared_ptr<MasterProcessSession>> AvailableChildSessions; - static std::mutex AvailableChildSessionMutex; - static std::condition_variable AvailableChildSessionCV; - time_t _idleSaveTime; time_t _autoSaveTime; commit bdecb37f7244a951dc6d6b72a12ad975fc006d90 Author: Tor Lillqvist <[email protected]> Date: Sun Apr 10 09:27:59 2016 +0300 'make check' seems to work much better currently diff --git a/loolwsd/PROBLEMS b/loolwsd/PROBLEMS index 81dc584..79287d5 100644 --- a/loolwsd/PROBLEMS +++ b/loolwsd/PROBLEMS @@ -31,13 +31,6 @@ 'disconnect'. When we move to actually saving the document all the time automatically, the 'disconnect' message should be removed. -- 'make check' does not work, or fails randomly, unless you have a - freshly started loolwsd with a --numprespawn option that is big - enough, 8 or so. Running 'make check' again without waiting for some - time (or re-starting loolwsd) fails most of the times. But - occasionally it passes. Clearly this is a sign that things do not - work as they should. - - Occasionally Control-C (SIGINT) doesn't shut fown loolwsd. One has to kill it with SIGKILL. Which of course leaves all the chroot jails around. commit fc87a51a6987f34566a3ae1202277966a9a208ed Author: Tor Lillqvist <[email protected]> Date: Sun Apr 10 09:25:45 2016 +0300 No fifoCV/fifoMutex any more (I did not bother checking whether they were just renamed, of whether the same anti-pattern is present in some other place.) diff --git a/loolwsd/PROBLEMS b/loolwsd/PROBLEMS index 6268eff..81dc584 100644 --- a/loolwsd/PROBLEMS +++ b/loolwsd/PROBLEMS @@ -1,11 +1,6 @@ - There is way too much of busy waiting for fairly arbitrarily chosen timeout periods in the code. -- The use of the fifoCV condition variable and its associated mutex - fifoMutex in createLibreOfficeKit() in LOOLBroker.cpp is pointless - as there is no code that would notify the condition variable - anywhere. - - The --clientport= option to a lookit process (when spawning them, not forking) can not work as intended. The ClientPortNumber variable is declared *static* in ChildProcessSession.hpp and thus is a _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
