Commit graph

3526 commits

Author SHA1 Message Date
Miklos Vajna
e2029921cb LOOLStress: avoid multiplying at int precision, then converting to long
Change-Id: Ie79296522d09be0f337f218bede1a28e9bac3a7c
2016-09-19 09:22:01 +02:00
Henry Castro
c6c2040849 loolwsd: test: log more info for each view 2016-09-17 18:13:56 -04:00
Henry Castro
a613025b0e loolwsd: test: add view name verbose 2016-09-17 18:13:32 -04:00
Henry Castro
7243e485d0 loolwsd: assign view id after loading
When session, it is not assigned, ViewCallback thread
will not enqueue the message
2016-09-17 18:13:05 -04:00
Henry Castro
722ca5daf5 loolwsd: log: warn lost messages 2016-09-17 18:12:44 -04:00
Tor Lillqvist
20d6acae29 Return true in LOOLSession::forwardToPeer() when peer is closing
Fixes the testEditAnnotationWriter unit test, and doesn't break any
other ones. Many other tests do fail, but they fail also without this
change.
2016-09-16 18:28:21 +03:00
Tor Lillqvist
fbd738c32a One more 2016-09-16 16:45:07 +03:00
Miklos Vajna
784f2eb94c Update bundled LibreOfficeKit include files
Change-Id: I8f08c3b22d81b81ba8dc13398269cd4b8e75aaf6
2016-09-16 14:50:32 +02:00
Ashod Nakashian
3d9b50aeeb loolwsd: unittest runner improvement and logging
Change-Id: I4ddce1775b620e9140366ae7965b37b6cce8689e
Reviewed-on: https://gerrit.libreoffice.org/28958
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-09-16 12:37:52 +00:00
Ashod Nakashian
b26b52af61 loolwsd: unittest for tile prioritization
Change-Id: Ib5ea6b94d651124106069f8d796b7359c92639a8
Reviewed-on: https://gerrit.libreoffice.org/28957
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-09-16 12:36:10 +00:00
Ashod Nakashian
ffa146a870 loolwsd: log tile version in stats
Change-Id: Ia8a466b50f5236cb555c962830843c4d7d77fa97
Reviewed-on: https://gerrit.libreoffice.org/28956
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-09-16 12:32:22 +00:00
Ashod Nakashian
d2872846d8 loolwsd: cleanup of unittests and helpers
Change-Id: I03a5cb29b51409f3b8cc51981b522248a29a6ba3
Reviewed-on: https://gerrit.libreoffice.org/28955
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-09-16 12:31:59 +00:00
Ashod Nakashian
67c05ec319 loolstress: improved benchmarking and stats
Change-Id: I8b9c2879dbc3ebc37df27eb5c4138bf48c4408c2
Reviewed-on: https://gerrit.libreoffice.org/28954
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-09-16 12:31:35 +00:00
Ashod Nakashian
a0478719ff loolwsd: benchmark iterations count as argument to the cli
Change-Id: I2598937ec01dbc4672f88f86d642b32b1b000d91
Reviewed-on: https://gerrit.libreoffice.org/28953
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-09-16 12:31:13 +00:00
Ashod Nakashian
fcb7da4c76 loolstress: cout <-> cerr
Change-Id: I5bd530ccddab357054a9093bec54807a649dbe05
Reviewed-on: https://gerrit.libreoffice.org/28952
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-09-16 12:30:55 +00:00
Miklos Vajna
3d27e285b6 lok::Document: rename getViews() to getViewsCount()
Adapt client code to the changed core.git API.

Change-Id: I752d27919b7983909c8e96900115cca26bac11c6
2016-09-16 12:32:19 +02:00
Tor Lillqvist
8518620ddd Try to unify format of log messages a tiny bit
Lots more of that to do if one could be bothered. Just some details I
noticed in passing.
2016-09-16 13:09:00 +03:00
Tor Lillqvist
42fdb3b079 Drop always-defaulted 'timeoutMs' parameter to countLoolKitProcesses()
Also, drop the pointless use of POLL_TIMEOUT_MS, we first multiplied by
it and then divided.
2016-09-16 12:52:55 +03:00
Tor Lillqvist
941f400e71 Minor comment fix 2016-09-16 12:03:57 +03:00
Tor Lillqvist
9d03ff2946 No need to include ChildSession.hpp here 2016-09-16 11:25:06 +03:00
Tor Lillqvist
4799bcc73e Clarify comments about the meaning of the three LOOLSession subclasses
Be careful in using the definite article for classes that are
instantiated as singletons in a process, and otherwise an indefinite
article. Also mention in which process objects of the type in question
exist.
2016-09-16 11:24:35 +03:00
Tor Lillqvist
9d17637488 Fix comment 2016-09-16 11:24:12 +03:00
Henry Castro
f1b54a3f57 loleaflet: add border color to L.Popup 2016-09-15 17:21:33 -04:00
Henry Castro
9ef5eaee88 loolwsd: ignore .dirstamp 2016-09-15 16:05:34 -04:00
Henry Castro
4d6fadfc0b loolwsd: test: simplify each view 2016-09-15 16:00:02 -04:00
Tor Lillqvist
d170a0c774 Remove some ASCII art 2016-09-15 21:32:35 +03:00
Tor Lillqvist
4197bc5881 Don't hide errors behind a bogus default
If TDOC is not defined, this is broken. Defining it as "" in that case
won't fix anything. Use abs_top_srcdir to be less dependent on what
the cwd is when the code runs.
2016-09-15 21:32:35 +03:00
Henry Castro
a97d6f5449 loolwsd: test: graphic view selection 2016-09-15 14:14:49 -04:00
Jan Holesovsky
a6f70aad79 bccu#2005 follow-up: Another place where we need the dummy document broker.
I think this is another potential race condition...
2016-09-15 17:48:01 +02:00
Jan Holesovsky
10392f9ba6 Decrease the level of indentation. 2016-09-15 17:22:28 +02:00
Jan Holesovsky
d1e0b978d6 bccu#2005 follow-up: If the document appearead in the meantime, finish early. 2016-09-15 16:36:29 +02:00
Pranav Kant
912281bd20 loleaflet: dos2unix this new file from upstream Leaflet
Change-Id: I87000cc481dc9b8880d80606b16cd4151d572be1
2016-09-15 19:25:10 +05:30
Marco Cecchetti
80153826db Revert "loolwsd: we use callbacks latch for not missing messages sent very early"
This reverts commit ed983f17cb.

Conflicts:
	loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h

Change-Id: Ia85b4d9223e9918dd33a66b8d6aeb0c3a1516a3c
Reviewed-on: https://gerrit.libreoffice.org/28904
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-09-15 13:23:39 +00:00
Jan Holesovsky
27bed804d5 bccu#2005: Make sure we don't create 2 jails for the same document.
When 2 users opened the document at the very same time, it happened that new
jails / instances were created for the document twice.

As a solution, insert a dummy (marked to destroy) document into the map of
DocumentBrokers, which will lead into synchronization between the two
instances.

[I suppose the synchronization did not work previously either, as emplace()
does not seem to modify the value when the key is already in the map.]
2016-09-15 12:50:26 +02:00
Miklos Vajna
27220aea39 test helpers: avoid unnecessary copies
Change-Id: I014cedcc10078ce03d1f4f3ae9403b6282b7dcac
2016-09-15 10:33:26 +02:00
Henry Castro
7cb35bff63 loleaflet: view name bind to popup 2016-09-14 19:30:26 -04:00
Henry Castro
44c3d5dfde loleaflet: add Path.Popup 2016-09-14 19:23:41 -04:00
Ashod Nakashian
c01629ab2a loolwsd: only prioritize tile messages and not tilecombine
Change-Id: Ia292e5b499dd4409dc3a672e4d5360c868d6c71f
2016-09-14 23:20:12 +01:00
Ashod Nakashian
ad6d77cd3b loolwsd: remove cursor of unloading views
Change-Id: I4281a5aa101f034007aa227bb18b14eeba806ea0
2016-09-14 23:19:56 +01:00
Ashod Nakashian
2db1db06c7 loolwsd: queue -> tileQueue
Change-Id: If61de6807fa7f52a703fe45948df911fe162f69a
2016-09-14 23:19:45 +01:00
Ashod Nakashian
ece87da287 loolwsd: tile prioritization per view cursor
Change-Id: I1410b64982ac2db04e5a47d744a95b8d2eab5f7e
2016-09-14 23:19:38 +01:00
Michael Meeks
787ee1d2d2 Revert "loolwsd: don't combine tiles by row to allow for better culling"
This breaks combine-tiles very significantly, viewing images
in documents with this appears to show each tile scaling and
rendering individually.

This reverts commit 99d0ee2ac1.
2016-09-14 22:15:43 +01:00
Pranav Kant
8bd7d83bdc loleaflet: Handle multiview text selections for part documents
Change-Id: I56425cde49b2b3b319204d7172f4ec4080b5bed1
2016-09-15 00:12:17 +05:30
Pranav Kant
4b18ca3772 loleaflet: Remove unused code
Change-Id: Ieb12e03b68eaacb99acb9853d02191c165f5b70c
2016-09-14 20:07:48 +05:30
Miklos Vajna
a652a013aa LOOLStress: unused using declaration
Change-Id: If20c38a4575074e7ca30069115002aadd1a1847f
2016-09-14 09:20:55 +02:00
Henry Castro
f85e6cfad9 loleaflet: simplify iteration view 2016-09-13 17:26:41 -04:00
Henry Castro
663f47b858 loleaflet: update graphic markers
LayerGroup handle internal list
Map handle internal list
TileLayer handle internal list

Reduce internal list
2016-09-13 16:24:35 -04:00
Miklos Vajna
74a29c4ee4 MessageQueue: avoid allocation of unnecessary temporary strings
Change-Id: I9162407020d84d0c92c9d1c6dfab806c67f3b873
2016-09-13 08:41:51 +02:00
Tor Lillqvist
c56888159a Update to match core master
Just two small comment and whitespace changes.
2016-09-12 13:09:08 +03:00
Miklos Vajna
6006e22001 LOOLKit: use std::move() in Document ctor
Change-Id: I25aeb5285465385858180747f441a69b858c4fe6
2016-09-12 08:15:37 +02:00