strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid "ThreadSanitizer: unlock of an unlocked mutex"

Browse source 
...in (somewhat contorted) test code

Change-Id: I247a30e580b3d458eb748a833100a662c9890d99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130991
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2022-03-04 15:31:59 +01:00
parent 9013ee1a00
commit 931996e61b
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sal/qa/osl/mutex/osl_Mutex.cxx
View file

@ -807,6 +807,8 @@ namespace osl_ResettableGuard
CPPUNIT_ASSERT_MESSAGE("ResettableMutexGuard constructor, test the acquire operation when initialized.", CPPUNIT_ASSERT_MESSAGE("ResettableMutexGuard constructor, test the acquire operation when initialized.",
bRes); bRes);
aMutex.acquire();
} }
void ctor_002( ) void ctor_002( )
@ -821,6 +823,8 @@ namespace osl_ResettableGuard
CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard constructor, test the acquire operation when initialized, we use reference constructor this time.", CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard constructor, test the acquire operation when initialized, we use reference constructor this time.",
bRes); bRes);
aMutex.acquire();
} }
CPPUNIT_TEST_SUITE(ctor); CPPUNIT_TEST_SUITE(ctor);
@ -853,6 +857,8 @@ namespace osl_ResettableGuard
bRes ); bRes );
CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard method: reset", CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard method: reset",
bRes1 ); bRes1 );
aMutex.acquire();
} }
#ifdef LINUX #ifdef LINUX
@ -863,6 +869,7 @@ namespace osl_ResettableGuard
/// shouldn't release after clear; /// shouldn't release after clear;
myMutexGuard.clear( ); myMutexGuard.clear( );
aMutex.acquire();
bool bRes = aMutex.release( ); bool bRes = aMutex.release( );
/// can release after reset. /// can release after reset.
@ -870,9 +877,11 @@ namespace osl_ResettableGuard
bool bRes1 = aMutex.release( ); bool bRes1 = aMutex.release( );
CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard method: reset, release after clear and reset, on Solaris, the mutex can be release without acquire, so it can not passed on (SOLARIS), but not the reason for reset_002", CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard method: reset, release after clear and reset, on Solaris, the mutex can be release without acquire, so it can not passed on (SOLARIS), but not the reason for reset_002",
!bRes ); bRes );
CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard method: reset, release after clear and reset, on Solaris, the mutex can be release without acquire, so it can not passed on (SOLARIS), but not the reason for reset_002", CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard method: reset, release after clear and reset, on Solaris, the mutex can be release without acquire, so it can not passed on (SOLARIS), but not the reason for reset_002",
bRes1 ); bRes1 );
aMutex.acquire();
} }
#endif #endif