diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-08-29 09:40:01 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-09-27 10:26:41 +0200 |
| commit | ce8bbb782b806e429ffb44226162967bed244d94 (patch) | |
| tree | 0b32d6ee6b57eedb21fde70376c2d2af84d9544e /vcl/win/app/salinst.cxx | |
| parent | 79a425900e31bda83cde1bee150c1234931cb8bd (diff) | |
Don't wait-yield non-main threads in the main thread
This prevents blocking the main thread by a yielding non-main thread.
The current solution is to wait on a condition, which is set by the
main thread on wakeup.
Change-Id: I8d680bb51a36ce1e0d3d4713d47d8e2ef93d7297
Reviewed-on: https://gerrit.libreoffice.org/42808
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/win/app/salinst.cxx')
| -rw-r--r-- | vcl/win/app/salinst.cxx | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx index 23e48532d3b9..b77e84eac739 100644 --- a/vcl/win/app/salinst.cxx +++ b/vcl/win/app/salinst.cxx @@ -572,31 +572,16 @@ bool WinSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents) SolarMutexReleaser aReleaser; if ( !IsMainThread() ) { - if ( bWait ) + // If you change the SendMessageW function, you might need to update + // the PeekMessage( ... PM_QS_POSTMESSAGE) calls! + bDidWork = SendMessageW( mhComWnd, SAL_MSG_THREADYIELD, + (WPARAM) false, (LPARAM) bHandleAllCurrentEvents ); + if ( !bDidWork && bWait ) { maWaitingYieldCond.reset(); maWaitingYieldCond.wait(); bDidWork = true; } - else { - // #97739# A SendMessage call blocks until the called thread (here: the main thread) - // returns. During a yield however, messages are processed in the main thread that might - // result in a new message loop due to opening a dialog. Thus, SendMessage would not - // return which will block this thread! - // Solution: just give up the time slice and hope that messages are processed - // by the main thread anyway (where all windows are created) - // If the mainthread is not currently handling messages, then our SendMessage would - // also do nothing, so this seems to be reasonable. - - // #i18883# only sleep if potential deadlock scenario, ie, when a dialog is open - if( ImplGetSVData()->maAppData.mnModalMode ) - Sleep(1); - else - // If you change the SendMessageW function, you might need to update - // the PeekMessage( ... PM_QS_POSTMESSAGE) calls! - bDidWork = SendMessageW( mhComWnd, SAL_MSG_THREADYIELD, - (WPARAM)bWait, (LPARAM)bHandleAllCurrentEvents ); - } } else { @@ -616,7 +601,8 @@ LRESULT CALLBACK SalComWndProc( HWND, UINT nMsg, WPARAM wParam, LPARAM lParam, i switch ( nMsg ) { case SAL_MSG_THREADYIELD: - nRet = static_cast<LRESULT>(ImplSalYield( (bool)wParam, (bool)lParam )); + assert( !(bool)wParam ); + nRet = static_cast<LRESULT>(ImplSalYield( false, (bool)lParam )); rDef = FALSE; break; case SAL_MSG_STARTTIMER: |