UNLOZE/sourcemod
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add reference counting and use it for CGameConfig (bug 5876 part 1, r=ds).

Browse Source 
--HG--
extra : rebase_source : 42b033d005ae3118b6505c530227c84e0e8a7553
This commit is contained in:
David Anderson
2013-08-23 00:18:11 -07:00
parent 5954f15989
commit f7991185ba
3 changed files with 306 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/logic/GameConfigs.cpp
+8 -24
View File
@@ -121,7 +121,6 @@ CGameConfig::CGameConfig(const char *file, const char *engine)
strncopy(m_File, file, sizeof(m_File));
m_pAddresses = new KTrie<AddressConf>();
m_pStrings = new BaseStringTable(512);
m_RefCount = 0;
m_CustomLevel = 0;
m_CustomHandler = NULL;
@@ -141,8 +140,7 @@ CGameConfig::CGameConfig(const char *file, const char *engine)
CGameConfig::~CGameConfig()
{
delete m_pAddresses;
delete m_pStrings;
g_GameConfigs.RemoveCachedConfig(this);
}
SMCResult CGameConfig::ReadSMC_NewSection(const SMCStates *states, const char *name)
@@ -1009,17 +1007,6 @@ bool CGameConfig::GetMemSig(const char *key, void **addr)
return true;
}
void CGameConfig::IncRefCount()
{
m_RefCount++;
}
unsigned int CGameConfig::DecRefCount()
{
m_RefCount--;
return m_RefCount;
}
GameConfigManager::GameConfigManager()
{
}
@@ -1073,7 +1060,7 @@ bool GameConfigManager::LoadGameConfigFile(const char *file, IGameConfig **_pCon
if ((ppConfig = m_Lookup.retrieve(file)) != NULL)
{
pConfig = *ppConfig;
pConfig->IncRefCount();
pConfig->AddRef();
*_pConfig = pConfig;
return true;
}
@@ -1090,22 +1077,14 @@ bool GameConfigManager::LoadGameConfigFile(const char *file, IGameConfig **_pCon
m_cfgs.push_back(pConfig);
m_Lookup.insert(file, pConfig);
pConfig->IncRefCount();
*_pConfig = pConfig;
return retval;
}
void GameConfigManager::CloseGameConfigFile(IGameConfig *cfg)
{
CGameConfig *pConfig = (CGameConfig *)cfg;
if (pConfig->DecRefCount() == 0)
{
m_Lookup.remove(pConfig->m_File);
delete pConfig;
}
pConfig->Release();
}
extern Handle_t g_GameConfigsType;
@@ -1155,3 +1134,8 @@ void GameConfigManager::AcquireLock()
void GameConfigManager::ReleaseLock()
{
}
void GameConfigManager::RemoveCachedConfig(CGameConfig *config)
{
m_Lookup.remove(config->m_File);
}
core/logic/GameConfigs.h
+8 -8
View File
@@ -1,5 +1,5 @@
/**
* vim: set ts=4 :
* vim: set ts=4 sw=4 tw=99 noet:
* =============================================================================
* SourceMod
* Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved.
@@ -38,6 +38,7 @@
#include <sh_list.h>
#include "sm_memtable.h"
#include <sm_trie_tpl.h>
#include <am-refcounting.h>
using namespace SourceMod;
using namespace SourceHook;
@@ -46,7 +47,8 @@ class SendProp;
class CGameConfig :
public ITextListener_SMC,
public IGameConfig
public IGameConfig,
public ke::Refcounted<CGameConfig>
{
friend class GameConfigManager;
public:
@@ -67,18 +69,14 @@ public: //IGameConfig
SendProp *GetSendProp(const char *key);
bool GetMemSig(const char *key, void **addr);
bool GetAddress(const char *key, void **addr);
public:
void IncRefCount();
unsigned int DecRefCount();
private:
BaseStringTable *m_pStrings;
ke::AutoPtr<BaseStringTable> m_pStrings;
char m_File[PLATFORM_MAX_PATH];
char m_CurFile[PLATFORM_MAX_PATH];
KTrie<int> m_Offsets;
KTrie<SendProp *> m_Props;
KTrie<int> m_Keys;
KTrie<void *> m_Sigs;
unsigned int m_RefCount;
/* Parse states */
int m_ParseState;
unsigned int m_IgnoreLevel;
@@ -112,7 +110,7 @@ private:
char m_AddressSignature[64];
int m_AddressReadCount;
int m_AddressRead[8];
KTrie<AddressConf> *m_pAddresses;
ke::AutoPtr<KTrie<AddressConf> > m_pAddresses;
const char *m_pEngine;
const char *m_pBaseEngine;
};
@@ -138,6 +136,8 @@ public: //SMGlobalClass
void OnSourceModStartup(bool late);
void OnSourceModAllInitialized();
void OnSourceModAllShutdown();
public:
void RemoveCachedConfig(CGameConfig *config);
private:
List<CGameConfig *> m_cfgs;
KTrie<CGameConfig *> m_Lookup;