diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2021-01-12 09:12:32 +0100 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-01-13 20:15:21 +0100 |
commit | f9c3a734221228cdf5a52ed6ebf9c0a3c1d44607 (patch) | |
tree | 0142366bb15ba1b589b298e30099f38de6d9ea22 /writerfilter/source/dmapper/GraphicHelpers.cxx | |
parent | 2e930dbe4abd22d4569e058096929ed2813d4b21 (diff) |
tdf#139074: Revert "WIN replace clipboard update thread with Idle" et al
This reverts commit 9617bc9544cd569066ff187c3672a87fe28fe17f "WIN replace
clipboard update thread with Idle" plus follow-up commits
f5ab8bcbfd20ecce4a358f62ee3f81b8b968a5de "WIN don't notify clipboard change with
SolarMutex" and c921f9bd64187823af2356d7a8ceb77444c17219 "Release solar mutex
before using an apartment-threaded COM object".
The Gerrit Jenkins Windows builds had started to abort after timeout for almost
all builds now. Going back to before the youngest of the above three commits,
c921f9bd64187823af2356d7a8ceb77444c17219 "Release solar mutex before using an
apartment-threaded COM object" did not improve things (see the
<https://gerrit.libreoffice.org/c/core/+/109100> "Test build #1, DO NOT SUBMIT"
chain, where three out of three of the Gerrit Jenkins Windows builds timed out).
But going back to before the oldest of the above three commits,
9617bc9544cd569066ff187c3672a87fe28fe17f "WIN replace clipboard update thread
with Idle", does look promising (see the
<https://gerrit.libreoffice.org/c/core/+/109155> "Test build #7, DO NOT SUBMIT"
chain, where three out of three of the Gerrit Jenkins Windows builds succeeded).
So the hope is that reverting all three commits brings back a green master,
allowing us to understand and fix the actual issue later.
Change-Id: Ie83ba742f216396b49f561d19c2cda7758740502
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109158
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 694b400f56842cd29ad1a960853cde5aef91e4f0)
Additional information regarding the backport to libreoffice-7-1:
c921f9bd64187823af2356d7a8ceb77444c17219 "Release solar mutex
before using an apartment-threaded COM object" was never backported to
libreoffice-7-1 so this patch only reverts 9617bc9544cd569066ff187c3672a87fe28fe17f "WIN replace
clipboard update thread with Idle" and
f5ab8bcbfd20ecce4a358f62ee3f81b8b968a5de "WIN don't notify clipboard change with
SolarMutex" in libreoffice-7-1 branch.
The backport was done using gerrit's interface by Xisco Fauli and no
conflict was found while cherry-picking it.
However, this change wasn't backported:
--- a/vcl/win/dtrans/WinClipboard.cxx
+++ b/vcl/win/dtrans/WinClipboard.cxx
@@ -91,9 +84,6 @@ CWinClipboard::~CWinClipboard()
uno::Reference<datatransfer::XTransferable> SAL_CALL CWinClipboard::getContents()
{
- DBG_TESTSOLARMUTEX();
- SolarMutexReleaser aReleaser;
-
osl::MutexGuard aGuard(m_aMutex);
so it was added manually.
See https://gerrit.libreoffice.org/c/core/+/109115
Change-Id: Ie83ba742f216396b49f561d19c2cda7758740502
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109115
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'writerfilter/source/dmapper/GraphicHelpers.cxx')
0 files changed, 0 insertions, 0 deletions