R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix progressively increasing CPU time in PurgeServerOverlays() when enable_debug_overlays is unset

Browse Source 
The default engine implementation of DrawAllOverlays will return early when cvar 'enable_debug_overlays' is false. The problem with this is that overlays are still added, which fills memory unnecessarily and also increases CPU time as they never decay, which overloads the function 'PurgeServerOverlays'. This became evident after profiling the application. Numerous people reported the bug.
This commit is contained in:
Kawe Mazidjatari 2022-11-10 02:40:34 +01:00
parent a92c72afc6
commit 95a544cdb9
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
r5dev/engine/debugoverlay.cpp
View File

@ -246,22 +246,9 @@ void DrawOverlay(OverlayBase_t* pOverlay)
//------------------------------------------------------------------------------
void DrawAllOverlays(bool bDraw)
{
if (!enable_debug_overlays->GetBool())
return;
EnterCriticalSection(&*s_OverlayMutex);
#ifndef CLIENT_DLL
if (ai_script_nodes_draw->GetInt() > -1)
g_pAIUtility->DrawAIScriptNetwork(*g_pAINetwork);
if (navmesh_draw_bvtree->GetInt() > -1)
g_pAIUtility->DrawNavMeshBVTree();
if (navmesh_draw_portal->GetInt() > -1)
g_pAIUtility->DrawNavMeshPortals();
if (navmesh_draw_polys->GetInt() > -1)
g_pAIUtility->DrawNavMeshPolys();
if (navmesh_draw_poly_bounds->GetInt() > -1)
g_pAIUtility->DrawNavMeshPolyBoundaries();
#endif // !CLIENT_DLL
const bool bOverlayEnabled = enable_debug_overlays->GetBool();
OverlayBase_t* pCurrOverlay = *s_pOverlays; // rdi
OverlayBase_t* pPrevOverlay = nullptr; // rsi
OverlayBase_t* pNextOverlay = nullptr; // rbx
@ -305,7 +292,7 @@ void DrawAllOverlays(bool bDraw)
{
bDraw = pCurrOverlay->m_nCreationTick == *g_nRenderTickCount;
}
if (bDraw)
if (bOverlayEnabled && bDraw)
{
if (bDraw)
{
@ -316,16 +303,33 @@ void DrawAllOverlays(bool bDraw)
pCurrOverlay = pCurrOverlay->m_pNextOverlay;
}
}
#ifndef CLIENT_DLL
if (bOverlayEnabled)
{
if (ai_script_nodes_draw->GetInt() > -1)
g_pAIUtility->DrawAIScriptNetwork(*g_pAINetwork);
if (navmesh_draw_bvtree->GetInt() > -1)
g_pAIUtility->DrawNavMeshBVTree();
if (navmesh_draw_portal->GetInt() > -1)
g_pAIUtility->DrawNavMeshPortals();
if (navmesh_draw_polys->GetInt() > -1)
g_pAIUtility->DrawNavMeshPolys();
if (navmesh_draw_poly_bounds->GetInt() > -1)
g_pAIUtility->DrawNavMeshPolyBoundaries();
}
#endif // !CLIENT_DLL
LeaveCriticalSection(&*s_OverlayMutex);
}
///////////////////////////////////////////////////////////////////////////////
void DebugOverlays_Attach()
{
DetourAttach((LPVOID*)&v_DrawAllOverlays, &DrawAllOverlays);
DetourAttach(&v_DrawAllOverlays, &DrawAllOverlays);
}
void DebugOverlays_Detach()
{
DetourDetach((LPVOID*)&v_DrawAllOverlays, &DrawAllOverlays);
DetourDetach(&v_DrawAllOverlays, &DrawAllOverlays);
}