strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
libreoffice-online/loolwsd/Common.hpp

49 lines
1.7 KiB
C++
Raw Normal View History

loolwsd: moved config values into common header Change-Id: Ib88379e453f207a6a5e6223045a393c769082be4 Reviewed-on: https://gerrit.libreoffice.org/20978 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-27 16:23:43 -06:00
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
// Default values and other shared data between processes.
#ifndef INCLUDED_COMMON_HPP
#define INCLUDED_COMMON_HPP
loolwsd: fixed server thread-pool TCPServer doesn't use the custom ThreadPool passed to it to dispatch connections. This leads to starvation when too many connections are initiated together. Because we open an internal socket back to master, we need to be able to dispatch two connections (two threads) for each client connection. Therefore, the default ThreadPool needs to have sufficient capacity to grow. A new constant is added to define this capacity and it is used to configure both the TCPServer (which configures the default ThreadPool) and the customer ThreadPool (used to host the actuall connection handler). Change-Id: I49adc039aa99e9350b0defc4a5e141b77524992e Reviewed-on: https://gerrit.libreoffice.org/21976 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-31 21:34:18 -06:00
// The maximum number of client connections we can accept.
constexpr int MAX_SESSIONS = 1024;
loolwsd: removed dead code Variables and options lingering from previous iterations removed. Standardizing static member names. Header inclusion cleanups. Change-Id: I65182ad4d100e0077f1b450be50cf95d7b8f0fc7 Reviewed-on: https://gerrit.libreoffice.org/20997 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-28 15:34:21 -06:00
constexpr int DEFAULT_CLIENT_PORT_NUMBER = 9980;
Run the tests on ports that do not conflict with a 'normal' loolwsd. For the moment, it will allow running 'make check' that does not conflict with an already running loolwsd (eg. from 'make run'). Later we can consider running more tests in parallel.
2016-05-04 06:06:34 -05:00
constexpr int DEFAULT_MASTER_PORT_NUMBER = 9981;
Rename MAINTENANCE_INTERVAL to something more descriptive
2016-04-11 03:17:27 -05:00
constexpr int WSD_SLEEP_SECS = 2;
loolwsd: better child management Change-Id: I0de190619008834f096517bd1cfafcdc83261f47 Reviewed-on: https://gerrit.libreoffice.org/24933 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-12 09:43:13 -05:00
constexpr int CHILD_TIMEOUT_SECS = 4;
loolwsd: improved polling and pong with client Change-Id: I17c4f7685d23b6e4c84a7f8b34fcb7dbcaf959f9 Reviewed-on: https://gerrit.libreoffice.org/21754 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-23 16:35:16 -06:00
constexpr int POLL_TIMEOUT_MS = 1000;
loolwsd: command timeout is now a const Change-Id: I9115f465fe760f4c388294bfb5e14cbb441c1174 Reviewed-on: https://gerrit.libreoffice.org/23979 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-04-10 21:16:04 -05:00
constexpr int COMMAND_TIMEOUT_MS = 5000;
loolwsd: Don't block on client sockets and timeout in 1 second Change-Id: I7fec1054cef25704f898a7a5211abfb398d61bee Reviewed-on: https://gerrit.libreoffice.org/28576 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-08-31 22:40:42 -05:00
constexpr int WS_SEND_TIMEOUT_MICROSECS = 1000000; // 1 second.
loolwsd: PIPE_BUFFER -> READ_BUFFER_SIZE = 2048 Change-Id: I12e9725549a15b2cb1c287db9de0fca732dafac2 Reviewed-on: https://gerrit.libreoffice.org/21678 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-21 07:49:43 -06:00
/// Pipe and Socket read buffer size.
/// Should be large enough for ethernet packets
/// which can be 1500 bytes long.
constexpr int READ_BUFFER_SIZE = 2048;
bccu#1468: handle 'nextmessage:' in prisoner -> master text frames There are cases when prisoner would send huge text data but without preceeding 'nextmessage' frames making the master throw WebSocketException. Also move the 'nextmessage' frame interpretation logic up in the 'else if' ladder to be able to detect and handle such huge text frames. Change-Id: Ibe44b69f4ab75c1b8096648c6006316c88366e7c Reviewed-on: https://gerrit.libreoffice.org/21835 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-27 03:05:54 -06:00
/// Size after which messages will be sent preceded with
/// 'nextmessage' frame to let the receiver know in advance
/// the size of larger coming message. All messages up to this
/// size are considered small messages.
constexpr int SMALL_MESSAGE_SIZE = READ_BUFFER_SIZE / 2;
loolwsd: moved config values into common header Change-Id: Ib88379e453f207a6a5e6223045a393c769082be4 Reviewed-on: https://gerrit.libreoffice.org/20978 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-27 16:23:43 -06:00
Revert "loolwsd: replace fifo for socket WSD -> Broker" This reverts commit 97c8f35ddffe9b363bb2544a40d81f623934a0ed. Since the Broker design has been extremely simplified, all communication between Broker <-> Kit are gone. Only a pipe between WSD and Broker remain. Temporarily reverting this to apply the Broker redesign, after which this patch can be reviewed and merged. This will be easier than trying to merge the redesigned Broker on top of this. Change-Id: Ia901fad604008654c01841df62e88918adad45e1 Reviewed-on: https://gerrit.libreoffice.org/23769 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-04-03 22:40:56 -05:00
constexpr auto FIFO_LOOLWSD = "loolwsdfifo";
Avoid defining constant strings in multiple places It is not a good idea to have the same string somewhat arbitrarily both as a static const members of the LOOLWSD class and then as a file-local static const in another file. Or defined as a separate local const static in each compilation unit that includes Common.hpp. Use constexpr instead, in Common.hpp.
2016-03-28 06:01:19 -05:00
constexpr auto FIFO_PATH = "pipe";
constexpr auto JAILED_DOCUMENT_ROOT = "/user/docs/";
loolwsd: childConnected event added to UnitWSD Change-Id: I3d19465229b434d07f50290f08462e9c9c66a6ca Reviewed-on: https://gerrit.libreoffice.org/24160 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-04-17 08:54:05 -05:00
constexpr auto CHILD_URI = "/loolws/child?";
Define FIFO_ADMIN_NOTIFY in only one place
2016-04-04 01:43:29 -05:00
constexpr auto NEW_CHILD_URI = "/loolws/newchild?";
loolwsd: removed lo_jail_subpath Really unused setting that caused deployment complications. Change-Id: If837fca4c904e82b23babd4a1f0f3f15b5ef57f4 Reviewed-on: https://gerrit.libreoffice.org/26705 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-06-27 07:27:08 -05:00
constexpr auto LO_JAIL_SUBPATH = "lo";
loolwsd: refactored JailedDocumentRoot path Change-Id: Ibee16e6ebde0ae1945be53903a0b0bad4f3300ed Reviewed-on: https://gerrit.libreoffice.org/21179 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 12:49:10 -06:00
Remove confusing ChildProcessSession include on LOOLWSD. Move the ClientPortNumber into both Kit and WSD.
2016-04-14 12:04:19 -05:00
// The client port number, both loolwsd and the kits have this.
extern int ClientPortNumber;
Run the tests on ports that do not conflict with a 'normal' loolwsd. For the moment, it will allow running 'make check' that does not conflict with an already running loolwsd (eg. from 'make run'). Later we can consider running more tests in parallel.
2016-05-04 06:06:34 -05:00
extern int MasterPortNumber;
Remove confusing ChildProcessSession include on LOOLWSD. Move the ClientPortNumber into both Kit and WSD.
2016-04-14 12:04:19 -05:00
loolwsd: moved config values into common header Change-Id: Ib88379e453f207a6a5e6223045a393c769082be4 Reviewed-on: https://gerrit.libreoffice.org/20978 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-27 16:23:43 -06:00
#endif
Consistency is a virtue (But sure, tons of much more annoying inconsistencies in style remain.)
2016-04-08 03:08:41 -05:00
loolwsd: moved config values into common header Change-Id: Ib88379e453f207a6a5e6223045a393c769082be4 Reviewed-on: https://gerrit.libreoffice.org/20978 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-27 16:23:43 -06:00
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Reference in a new issue Copy permalink