mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vcl: simplify WNT SalYieldMutex::release() further ...

Browse Source 
... by asserting that the current thread is the owner of the
SalYieldMutex.  Anything else would be a bug anyway.

Change-Id: I564c184ae21b99a096f67edbc729b3f2b0e307de
This commit is contained in:
Michael Stahl
2016-04-12 14:47:45 +02:00
parent edac93859b
commit 1a3fd60b98
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
vcl/win/app/salinst.cxx
View File

@@ -143,33 +143,30 @@ void SalYieldMutex::acquire()
void SalYieldMutex::release()
{
DWORD nThreadId = GetCurrentThreadId();
if ( mnThreadId != nThreadId )
m_mutex.release();
else
assert(mnThreadId == nThreadId);
bool const isRelease(1 == mnCount);
if ( isRelease )
{
bool const isRelease(1 == mnCount);
if ( isRelease )
OpenGLContext::prepareForYield();
SalData* pSalData = GetSalData();
if ( pSalData->mnAppThreadId != nThreadId )
{
OpenGLContext::prepareForYield();
// If we don't call these message, the Output from the
// Java clients doesn't come in the right order
GdiFlush();
SalData* pSalData = GetSalData();
if ( pSalData->mnAppThreadId != nThreadId )
{
// If we don't call these message, the Output from the
// Java clients doesn't come in the right order
GdiFlush();
}
mnThreadId = 0;
}
mnThreadId = 0;
}
mnCount--;
m_mutex.release();
mnCount--;
m_mutex.release();
if ( isRelease )
{ // do this *after* release
m_condition.set(); // wake up ImplSalYieldMutexAcquireWithWait()
}
if ( isRelease )
{ // do this *after* release
m_condition.set(); // wake up ImplSalYieldMutexAcquireWithWait()
}
}