GitHub/GameNetworkingSockets
1
0
Fork 0
mirror of https://github.com/ValveSoftware/GameNetworkingSockets.git synced 2026-05-29 16:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a hack to try to fix tsan

Browse Source 
(cherry picked from commit 1d3a483408)
This commit is contained in:
Fletcher Dunn
2026-05-05 22:07:09 -07:00
parent c4a6aa8e60
commit ff7ab00551
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/steamnetworkingsockets/clientlib/steamnetworkingsockets_lowlevel.h
+18 -2
View File
@@ -526,8 +526,24 @@ struct Lock : LockDebugInfo
inline bool try_lock_for( int msTimeout, const char *pszTag = nullptr )
{
LockDebugInfo::AboutToLock( true );
if ( !m_impl.try_lock_for( std::chrono::milliseconds( msTimeout ) ) )
return false;
#ifdef __SANITIZE_THREAD__
// TSan does not intercept pthread_mutex_timedlock, so try_lock_for() leaves
// the lock untracked from TSan's perspective, causing false "unlock by wrong
// thread" reports later. Use try_lock() in a loop instead: pthread_mutex_trylock
// IS intercepted, so TSan correctly tracks ownership.
auto deadline = std::chrono::steady_clock::now() + std::chrono::milliseconds( msTimeout );
for (;;)
{
if ( m_impl.try_lock() )
break;
if ( std::chrono::steady_clock::now() >= deadline )
return false;
std::this_thread::sleep_for( std::chrono::milliseconds( 1 ) );
}
#else
if ( !m_impl.try_lock_for( std::chrono::milliseconds( msTimeout ) ) )
return false;
#endif
LockDebugInfo::OnLocked( pszTag );
return true;
}