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

Switch ConVar, CoreConfig off KTrie (bug 5884 part 8, r=ds).

Browse Source
This commit is contained in:
David Anderson 2013-08-25 12:13:30 -07:00
parent 3850765759
commit 77c7b312ea
4 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/ConVarManager.cpp
View File

@ -33,7 +33,7 @@
#include "sm_srvcmds.h" #include "sm_srvcmds.h"
#include "sm_stringutil.h" #include "sm_stringutil.h"
#include <sh_vector.h> #include <sh_vector.h>
#include <sm_trie_tpl.h> #include <sm_namehashset.h>
#include "logic_bridge.h" #include "logic_bridge.h"
ConVarManager g_ConVarManager; ConVarManager g_ConVarManager;
@ -54,7 +54,7 @@ SH_DECL_HOOK5_void(IServerPluginCallbacks, OnQueryCvarValueFinished, SH_NOATTRIB
const ParamType CONVARCHANGE_PARAMS[] = {Param_Cell, Param_String, Param_String}; const ParamType CONVARCHANGE_PARAMS[] = {Param_Cell, Param_String, Param_String};
typedef List<const ConVar *> ConVarList; typedef List<const ConVar *> ConVarList;
KTrie<ConVarInfo *> convar_cache; NameHashSet<ConVarInfo *> convar_cache;
class ConVarReentrancyGuard class ConVarReentrancyGuard
{ {
@ -245,16 +245,7 @@ void ConVarManager::OnSourceModVSPReceived()
bool convar_cache_lookup(const char *name, ConVarInfo **pVar) bool convar_cache_lookup(const char *name, ConVarInfo **pVar)
{ {
ConVarInfo **pLookup = convar_cache.retrieve(name); return convar_cache.retrieve(name, pVar);
if (pLookup != NULL)
{
*pVar = *pLookup;
return true;
}
else
{
return false;
}
} }
void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe) void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe)

7
core/ConVarManager.h
View File

@ -1,5 +1,5 @@
/** /**
* vim: set ts=4 : * vim: set ts=4 sw=4 tw=99 noet :
* ============================================================================= * =============================================================================
* SourceMod * SourceMod
* Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved. * Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved.
@ -65,6 +65,11 @@ struct ConVarInfo
IChangeableForward *pChangeForward; /**< Forward associated with convar */ IChangeableForward *pChangeForward; /**< Forward associated with convar */
ConVar *pVar; /**< The actual convar */ ConVar *pVar; /**< The actual convar */
List<IConVarChangeListener *> changeListeners; List<IConVarChangeListener *> changeListeners;
static inline bool matches(const char *name, const ConVarInfo *info)
{
return strcmp(name, info->pVar->GetName()) == 0;
}
}; };
/** /**

10
core/CoreConfig.cpp
View File

@ -1,5 +1,5 @@
/** /**
* vim: set ts=4 : * vim: set ts=4 sw=4 tw=99 noet :
* ============================================================================= * =============================================================================
* SourceMod * SourceMod
* Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved. * Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved.
@ -304,12 +304,10 @@ ConfigResult CoreConfig::SetConfigOption(const char *option, const char *value,
const char *CoreConfig::GetCoreConfigValue(const char *key) const char *CoreConfig::GetCoreConfigValue(const char *key)
{ {
int *pKey = m_KeyValues.retrieve(key); int address;
if (pKey == NULL) if (!m_KeyValues.retrieve(key, &address))
{
return NULL; return NULL;
} return m_Strings.GetString(address);
return m_Strings.GetString(*pKey);
} }
bool SM_AreConfigsExecuted() bool SM_AreConfigsExecuted()

6
core/CoreConfig.h
View File

@ -1,5 +1,5 @@
/** /**
* vim: set ts=4 : * vim: set ts=4 sw=4 tw=99 noet :
* ============================================================================= * =============================================================================
* SourceMod * SourceMod
* Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved. * Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved.
@ -35,7 +35,7 @@
#include "sm_globals.h" #include "sm_globals.h"
#include <ITextParsers.h> #include <ITextParsers.h>
#include <IRootConsoleMenu.h> #include <IRootConsoleMenu.h>
#include <sm_trie_tpl.h> #include <sm_stringhashmap.h>
#include "sm_memtable.h" #include "sm_memtable.h"
using namespace SourceMod; using namespace SourceMod;
@ -69,7 +69,7 @@ private:
ConfigResult SetConfigOption(const char *option, const char *value, ConfigSource, char *Error, size_t maxlength); ConfigResult SetConfigOption(const char *option, const char *value, ConfigSource, char *Error, size_t maxlength);
private: private:
BaseStringTable m_Strings; BaseStringTable m_Strings;
KTrie<int> m_KeyValues; StringHashMap<int> m_KeyValues;
}; };
extern bool SM_AreConfigsExecuted(); extern bool SM_AreConfigsExecuted();