Improve performance of CClientObjectManager::UpdateLimitInfo

Client/mods/deathmatch/logic/CClientObjectManager.cpp

@@ -229,10 +229,23 @@ void CClientObjectManager::OnDestruction(CClientObject* pObject)
 
 void CClientObjectManager::UpdateLimitInfo()
 {
+    m_iEntryInfoNodeEntries = g_pMultiplayer->EntryInfoNodePool_NoOfUsedSpaces();
+    m_iPointerNodeSingleLinkEntries = g_pMultiplayer->PtrNodeSingleLinkPool_NoOfUsedSpaces();
+    m_iPointerNodeDoubleLinkEntries = g_pMultiplayer->PtrNodeDoubleLinkPool_NoOfUsedSpaces();
+
+    /*
     CPools* pPools = g_pGame->GetPools();
-    m_iEntryInfoNodeEntries = pPools->GetEntryInfoNodePool()->GetNumberOfUsedSpaces();
-    m_iPointerNodeSingleLinkEntries = pPools->GetPointerNodeSingleLinkPool()->GetNumberOfUsedSpaces();
-    m_iPointerNodeDoubleLinkEntries = pPools->GetPointerNodeDoubleLinkPool()->GetNumberOfUsedSpaces();
+    unsigned int nEntryInfoNodeEntries = pPools->GetEntryInfoNodePool()->GetNumberOfUsedSpaces();
+    unsigned int nPointerNodeSingleLinkEntries = pPools->GetPointerNodeSingleLinkPool()->GetNumberOfUsedSpaces();
+    unsigned int nPointerNodeDoubleLinkEntries = pPools->GetPointerNodeDoubleLinkPool()->GetNumberOfUsedSpaces();
+
+    g_pCore->ChatPrintf("%d = %d ### %d = %d ### %d = %d", false, nEntryInfoNodeEntries, m_iEntryInfoNodeEntries, nPointerNodeSingleLinkEntries,
+                        m_iPointerNodeSingleLinkEntries, nPointerNodeDoubleLinkEntries, m_iPointerNodeDoubleLinkEntries);
+
+    assert(nEntryInfoNodeEntries == m_iEntryInfoNodeEntries);
+    assert(nPointerNodeSingleLinkEntries == m_iPointerNodeSingleLinkEntries);
+    assert(nPointerNodeDoubleLinkEntries == m_iPointerNodeDoubleLinkEntries);
+    */
 }
 
 bool CClientObjectManager::StaticIsObjectLimitReached()

Client/multiplayer_sa/CMultiplayerSA.cpp

@@ -1561,6 +1561,7 @@ void CMultiplayerSA::InitHooks()
 
     InitHooks_Streaming();
     InitHooks_FrameRateFixes();
+    InitHooks_ObjectStreamerOptimization();
 }
 
 // Used to store copied pointers for explosions in the FxSystem

Client/multiplayer_sa/CMultiplayerSA.h

@@ -79,6 +79,7 @@ class CMultiplayerSA : public CMultiplayer
     void                InitHooks_FixLineOfSightArgs();
     void                InitHooks_Streaming();
     void                InitHooks_FrameRateFixes();
+    void                InitHooks_ObjectStreamerOptimization();
     CRemoteDataStorage* CreateRemoteDataStorage();
     void                DestroyRemoteDataStorage(CRemoteDataStorage* pData);
     void                AddRemoteDataStorage(CPlayerPed* pPed, CRemoteDataStorage* pData);
@@ -296,6 +297,10 @@ class CMultiplayerSA : public CMultiplayer
     eAnimID    GetLastStaticAnimationID() { return m_dwLastStaticAnimID; }
     DWORD      GetLastAnimArrayAddress() { return m_dwLastAnimArrayAddress; }
 
+    unsigned int EntryInfoNodePool_NoOfUsedSpaces() const noexcept override;
+    unsigned int PtrNodeSingleLinkPool_NoOfUsedSpaces() const noexcept override;
+    unsigned int PtrNodeDoubleLinkPool_NoOfUsedSpaces() const noexcept override;
+
     CVector      m_vecAkimboTarget;
     bool         m_bAkimboTargetUp;
     static char* ms_PlayerImgCachePtr;

Client/multiplayer_sa/CMultiplayerSA_ObjectStreamerOptimization.cpp

@@ -0,0 +1,169 @@
+/*****************************************************************************
+ *
+ *  PROJECT:     Multi Theft Auto
+ *  LICENSE:     See LICENSE in the top level directory
+ *  FILE:        multiplayer_sa/CMultiplayerSA_ObjectStreamerOptimization.cpp
+ *
+ *  Multi Theft Auto is available from https://www.multitheftauto.com/
+ *
+ *****************************************************************************/
+
+#include "StdInc.h"
+
+static unsigned int CEntryInfoNodePool_UsedSpaces = 0;
+static unsigned int CPtrNodeSingleLinkPool_UsedSpaces = 0;
+static unsigned int CPtrNodeDoubleLinkPool_UsedSpaces = 0;
+
+#define HOOKPOS_CEntryInfoNodePool__New 0x536D6E
+#define HOOKSIZE_CEntryInfoNodePool__New 0x5
+static void _declspec(naked) HOOK_CEntryInfoNodePool__New()
+{
+    _asm {
+        inc CEntryInfoNodePool_UsedSpaces
+
+        lea eax, [ecx+eax*4]
+        pop esi
+        ret
+    }
+}
+
+#define HOOKPOS_CEntryInfoNode__operator_delete 0x536DF1
+#define HOOKSIZE_CEntryInfoNode__operator_delete 0x6
+static const unsigned int RETURN_CEntryInfoNode__operator_delete = 0x536DF7;
+static void _declspec(naked) HOOK_CEntryInfoNode__operator_delete()
+{
+    _asm {
+        dec CEntryInfoNodePool_UsedSpaces
+
+        lea eax, [ecx+edx]
+        or byte ptr [eax], 0x80
+        jmp RETURN_CEntryInfoNode__operator_delete
+    }
+}
+
+#define HOOKPOS_CEntryInfoList__Flush 0x536E6C
+#define HOOKSIZE_CEntryInfoList__Flush 0x5
+static const unsigned int RETURN_CEntryInfoList__Flush = 0x536E71;
+static void _declspec(naked) HOOK_CEntryInfoList__Flush()
+{
+    _asm {
+        dec CEntryInfoNodePool_UsedSpaces
+
+        or bl, 0x80
+        mov [eax], bl
+        jmp RETURN_CEntryInfoList__Flush
+    }
+}
+
+
+#define HOOKPOS_CPtrNodeSingleLinkPool__New 0x55229B
+#define HOOKSIZE_CPtrNodeSingleLinkPool__New 0x5
+static void _declspec(naked) HOOK_CPtrNodeSingleLinkPool__New()
+{
+    _asm {
+        inc CPtrNodeSingleLinkPool_UsedSpaces
+
+        lea eax, [ecx+eax*8]
+        pop esi
+        ret
+    }
+}
+#define HOOKPOS_CPtrNodeSingleLink__operator_delete 0x5523AA
+#define HOOKSIZE_CPtrNodeSingleLink__operator_delete 0x5
+static const unsigned int RETURN_CPtrNodeSingleLink__operator_delete = 0x5523AF;
+static void _declspec(naked) HOOK_CPtrNodeSingleLink__operator_delete()
+{
+    _asm {
+        dec CPtrNodeSingleLinkPool_UsedSpaces
+
+        or bl, 0x80
+        mov [ecx], bl
+        jmp RETURN_CPtrNodeSingleLink__operator_delete
+    }
+}
+
+#define HOOKPOS_CPtrListSingleLink__Flush 0x55244D
+#define HOOKSIZE_CPtrListSingleLink__Flush 0x6
+static const unsigned int RETURN_CPtrListSingleLink__Flush = 0x552453;
+static void _declspec(naked) HOOK_CPtrListSingleLink__Flush()
+{
+    _asm {
+        dec CPtrNodeSingleLinkPool_UsedSpaces
+
+        or byte ptr [edx+eax], 0x80
+        add edx, eax
+        jmp RETURN_CPtrListSingleLink__Flush
+    }
+}
+
+
+#define HOOKPOS_CPtrNodeDoubleLinkPool__New 0x55233E
+#define HOOKSIZE_CPtrNodeDoubleLinkPool__New 0x6
+static void _declspec(naked) HOOK_CPtrNodeDoubleLinkPool__New()
+{
+    _asm {
+        inc CPtrNodeDoubleLinkPool_UsedSpaces
+
+        lea eax, [ecx+eax*4]
+        pop esi
+        ret
+    }
+}
+
+#define HOOKPOS_CPtrNodeDoubleLink__operator_delete 0x5523F0
+#define HOOKSIZE_CPtrNodeDoubleLink__operator_delete 0x6
+static const unsigned int RETURN_CPtrNodeDoubleLink__operator_delete = 0x5523F6;
+static void _declspec(naked) HOOK_CPtrNodeDoubleLink__operator_delete()
+{
+    _asm {
+        dec CPtrNodeDoubleLinkPool_UsedSpaces
+
+        lea eax, [ecx+edx]
+        or byte ptr [eax], 0x80
+        jmp RETURN_CPtrNodeDoubleLink__operator_delete
+    }
+}
+
+#define HOOKPOS_CPtrListDoubleLink__Flush 0x5524CB
+#define HOOKSIZE_CPtrListDoubleLink__Flush 0x5
+static const unsigned int RETURN_CPtrListDoubleLink__Flush = 0x5524D0;
+static void _declspec(naked) HOOK_CPtrListDoubleLink__Flush()
+{
+    _asm {
+        dec CPtrNodeDoubleLinkPool_UsedSpaces
+
+        or bl, 0x80
+        mov [eax], bl
+        jmp RETURN_CPtrListDoubleLink__Flush
+    }
+}
+
+void CMultiplayerSA::InitHooks_ObjectStreamerOptimization()
+{
+    EZHookInstall(CEntryInfoNodePool__New);
+    EZHookInstall(CEntryInfoNode__operator_delete);
+    EZHookInstall(CEntryInfoList__Flush);
+
+    EZHookInstall(CPtrNodeSingleLinkPool__New);
+    EZHookInstall(CPtrNodeSingleLink__operator_delete);
+    EZHookInstall(CPtrListSingleLink__Flush);
+
+    EZHookInstall(CPtrNodeDoubleLinkPool__New);
+    EZHookInstall(CPtrNodeDoubleLink__operator_delete);
+    EZHookInstall(CPtrListDoubleLink__Flush);
+}
+
+unsigned int CMultiplayerSA::EntryInfoNodePool_NoOfUsedSpaces() const noexcept
+{
+    return CEntryInfoNodePool_UsedSpaces;
+}
+
+unsigned int CMultiplayerSA::PtrNodeSingleLinkPool_NoOfUsedSpaces() const noexcept
+{
+    return CPtrNodeSingleLinkPool_UsedSpaces;
+}
+
+unsigned int CMultiplayerSA::PtrNodeDoubleLinkPool_NoOfUsedSpaces() const noexcept
+{
+    return CPtrNodeDoubleLinkPool_UsedSpaces;
+}

Client/sdk/multiplayer/CMultiplayer.h

@@ -390,4 +390,8 @@ class CMultiplayer
     virtual eAnimGroup GetLastStaticAnimationGroupID() = 0;
     virtual eAnimID    GetLastStaticAnimationID() = 0;
     virtual DWORD      GetLastAnimArrayAddress() = 0;
+
+    virtual unsigned int EntryInfoNodePool_NoOfUsedSpaces() const noexcept = 0;
+    virtual unsigned int PtrNodeSingleLinkPool_NoOfUsedSpaces() const noexcept = 0;
+    virtual unsigned int PtrNodeDoubleLinkPool_NoOfUsedSpaces() const noexcept = 0;
 };