Deprecated Acquire/ReleaseLock from IGameConfigManager, use thread pump in updater.

This commit is contained in:
David Anderson
2009-02-17 15:59:51 -05:00
parent 16033c1307
commit 97e25c37de
6 changed files with 102 additions and 80 deletions
-11
View File
@@ -762,15 +762,11 @@ bool CGameConfig::EnterFile(const char *file, char *error, size_t maxlength)
bShouldBeReadingDefault = true;
m_ParseState = PSTATE_NONE;
g_GameConfigs.AcquireLock();
if ((err=textparsers->ParseSMCFile(m_CurFile, this, &state, error, maxlength))
!= SMCError_Okay)
{
const char *msg;
g_GameConfigs.ReleaseLock();
msg = textparsers->GetSMCErrorString(err);
g_Logger.LogError("[SM] Error parsing gameconfig file \"%s\":", m_CurFile);
@@ -791,8 +787,6 @@ bool CGameConfig::EnterFile(const char *file, char *error, size_t maxlength)
return false;
}
g_GameConfigs.ReleaseLock();
return true;
}
@@ -860,8 +854,6 @@ GameConfigManager::~GameConfigManager()
void GameConfigManager::OnSourceModStartup(bool late)
{
m_FileLock = g_pThreader->MakeMutex();
LoadGameConfigFile("core.games", &g_pGameConf, NULL, 0);
strncopy(g_Game, g_SourceMod.GetGameFolderName(), sizeof(g_Game));
@@ -896,7 +888,6 @@ void GameConfigManager::OnSourceModAllInitialized()
void GameConfigManager::OnSourceModAllShutdown()
{
CloseGameConfigFile(g_pGameConf);
m_FileLock->DestroyThis();
}
bool GameConfigManager::LoadGameConfigFile(const char *file, IGameConfig **_pConfig, char *error, size_t maxlength)
@@ -991,10 +982,8 @@ void GameConfigManager::RemoveUserConfigHook(const char *sectionname, ITextListe
void GameConfigManager::AcquireLock()
{
m_FileLock->Lock();
}
void GameConfigManager::ReleaseLock()
{
m_FileLock->Unlock();
}
-1
View File
@@ -120,7 +120,6 @@ public: //SMGlobalClass
private:
List<CGameConfig *> m_cfgs;
Trie *m_pLookup;
IMutex *m_FileLock;
public:
KTrie<ITextListener_SMC *> m_customHandlers;
};