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

Cleanup locking issues with connection configvals

Browse Source 
We've been kind of sloppy and not completely threadsafe. I doubt we have had
any real problems, but still, this is better.

P4:6354921
This commit is contained in:
Fletcher Dunn
2021-02-06 12:53:18 -08:00
parent 10ece5ef90
commit e0aa3c021b
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/steamnetworkingsockets/clientlib/csteamnetworkingsockets.cpp
+8 -5
View File
@@ -1570,7 +1570,9 @@ static ConfigValue<T> *GetConnectionVar( const GlobalConfigValueEntry *pEntry, C
template<typename T>
static ConfigValue<T> *EvaluateScopeConfigValue( GlobalConfigValueEntry *pEntry,
ESteamNetworkingConfigScope eScopeType,
intptr_t scopeObj )
intptr_t scopeObj,
ConnectionScopeLock &connectionLock // Lock this, if it's a connection
)
{
switch ( eScopeType )
{
@@ -1612,8 +1614,7 @@ static ConfigValue<T> *EvaluateScopeConfigValue( GlobalConfigValueEntry *pEntry,
// the "front door". So this means if the app tries to set a config option on a
// connection that technically no longer exists, we will actually allow that, when
// we probably should fail the call.
ConnectionScopeLock scopeLock; // FIXME We are releasing the lock too soon here! This doesn't work
CSteamNetworkConnectionBase *pConn = GetConnectionByHandle( HSteamNetConnection( scopeObj ), scopeLock );
CSteamNetworkConnectionBase *pConn = GetConnectionByHandle( HSteamNetConnection( scopeObj ), connectionLock );
if ( pConn )
{
if ( pEntry->m_eScope == k_ESteamNetworkingConfig_Connection )
@@ -1790,7 +1791,8 @@ bool SetConfigValueTyped(
ESteamNetworkingConfigDataType eDataType,
const void *pArg
) {
ConfigValue<T> *pVal = EvaluateScopeConfigValue<T>( pEntry, eScopeType, scopeObj );
ConnectionScopeLock connectionLock;
ConfigValue<T> *pVal = EvaluateScopeConfigValue<T>( pEntry, eScopeType, scopeObj, connectionLock );
if ( !pVal )
return false;
@@ -1878,7 +1880,8 @@ ESteamNetworkingGetConfigValueResult GetConfigValueTyped(
intptr_t scopeObj,
void *pResult, size_t *cbResult
) {
ConfigValue<T> *pVal = EvaluateScopeConfigValue<T>( pEntry, eScopeType, scopeObj );
ConnectionScopeLock connectionLock;
ConfigValue<T> *pVal = EvaluateScopeConfigValue<T>( pEntry, eScopeType, scopeObj, connectionLock );
if ( !pVal )
{
*cbResult = 0;