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

sdkhooks: retain vtable hook until level end (#2094)

Browse Source 
* Band-aid for Bulk SDKHooks performance impact on linux

Platform specific changes.

* Oops forgot about header

* Simplified/improved LevelShutdown code
This commit is contained in:
Kaela 2024-05-18 13:30:20 +02:00 committed by GitHub
parent 7c757ac119
commit e3734803f0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
extensions/sdkhooks/extension.cpp
View File

@ -151,6 +151,7 @@ CUtlVector<IEntityListener *> *EntListeners()
/**
* IServerGameDLL & IVEngineServer Hooks
*/
SH_DECL_HOOK0_void(IServerGameDLL, LevelShutdown, SH_NOATTRIB, false);
SH_DECL_HOOK6(IServerGameDLL, LevelInit, SH_NOATTRIB, 0, bool, const char *, const char *, const char *, const char *, bool, bool);
#ifdef GAMEDESC_CAN_CHANGE
SH_DECL_HOOK0(IServerGameDLL, GetGameDescription, SH_NOATTRIB, 0, const char *);
@ -247,6 +248,8 @@ bool SDKHooks::SDK_OnLoad(char *error, size_t maxlength, bool late)
sharesys->AddCapabilityProvider(myself, this, "SDKHook_DmgCustomInOTD");
sharesys->AddCapabilityProvider(myself, this, "SDKHook_LogicalEntSupport");
SH_ADD_HOOK(IServerGameDLL, LevelShutdown, gamedll, SH_MEMBER(this, &SDKHooks::LevelShutdown), false);
playerhelpers->AddClientListener(&g_Interface);
plsys->AddPluginsListener(&g_Interface);
@ -365,7 +368,9 @@ void SDKHooks::SDK_OnUnload()
forwards->ReleaseForward(g_pOnLevelInit);
plsys->RemovePluginsListener(&g_Interface);
SH_REMOVE_HOOK(IServerGameDLL, LevelShutdown, gamedll, SH_MEMBER(this, &SDKHooks::LevelShutdown), true);
playerhelpers->RemoveClientListener(&g_Interface);
sharesys->DropCapabilityProvider(myself, this, "SDKHook_DmgCustomInOTD");
@ -445,6 +450,24 @@ void SDKHooks::OnClientDisconnecting(int client)
HandleEntityDeleted(pEntity);
}
void SDKHooks::LevelShutdown()
{
#if defined PLATFORM_LINUX
for (size_t type = 0; type < SDKHook_MAXHOOKS; ++type)
{
std::vector<CVTableList *> &vtablehooklist = g_HookList[type];
for (size_t listentry = 0; listentry < vtablehooklist.size(); ++listentry)
{
std::vector<HookList> &pawnhooks = vtablehooklist[listentry]->hooks;
pawnhooks.clear();
delete vtablehooklist[listentry];
}
vtablehooklist.clear();
}
#endif
}
void SDKHooks::AddEntityListener(ISMEntityListener *listener)
{
m_EntListeners.push_back(listener);
@ -791,12 +814,14 @@ void SDKHooks::Unhook(CBaseEntity *pEntity)
entry--;
}
#if !defined PLATFORM_LINUX
if (pawnhooks.size() == 0)
{
delete vtablehooklist[listentry];
vtablehooklist.erase(vtablehooklist.begin() + listentry);
listentry--;
}
#endif
}
}
}
@ -820,12 +845,14 @@ void SDKHooks::Unhook(IPluginContext *pContext)
entry--;
}
#if !defined PLATFORM_LINUX
if (pawnhooks.size() == 0)
{
delete vtablehooklist[listentry];
vtablehooklist.erase(vtablehooklist.begin() + listentry);
listentry--;
}
#endif
}
}
}
@ -862,12 +889,14 @@ void SDKHooks::Unhook(int entity, SDKHookType type, IPluginFunction *pCallback)
entry--;
}
#if !defined PLATFORM_LINUX
if (pawnhooks.size() == 0)
{
delete vtablehooklist[listentry];
vtablehooklist.erase(vtablehooklist.begin() + listentry);
listentry--;
}
#endif
break;
}

2
extensions/sdkhooks/extension.h
View File

@ -259,6 +259,8 @@ public: // ISDKHooks
virtual void AddEntityListener(ISMEntityListener *listener);
virtual void RemoveEntityListener(ISMEntityListener *listener);
public: // IServerGameDLL
void LevelShutdown();
private:
SourceHook::List<ISMEntityListener *> m_EntListeners;