Merge pull request #315 from crymp-net/fix-tracermanager-hang

Fix tracermanager hang

Author: griseraner

Code/CryGame/Items/Weapons/Projectile.cpp

@@ -719,7 +719,7 @@ void CProjectile::Destroy()
 
 	bool returnToPoolOK = true;
 
-	const bool reusable = m_pAmmoParams->flags & (ENTITY_FLAG_CLIENT_ONLY | ENTITY_FLAG_SERVER_ONLY);
+	const bool reusable = g_pGameCVars->mp_recycleProjectiles && m_pAmmoParams->flags & (ENTITY_FLAG_CLIENT_ONLY | ENTITY_FLAG_SERVER_ONLY);
 	if (reusable)
 	{
 		returnToPoolOK = g_pGame->GetWeaponSystem()->ReturnToPool(this);

Code/CryGame/Items/Weapons/TracerManager.cpp

@@ -182,31 +182,7 @@ void CTracerManager::EmitTracer(const STracerParams& params)
     if (!g_pGameCVars->g_enableTracers || !gEnv->bClient)
         return;
 
-    int idx = -1;
-    const int poolSize = static_cast<int>(m_pool.size());
-    int i = m_lastFree + 1;
-
-    while (true)
-    {
-        if (i >= poolSize) i = 0;
-        if (i == m_lastFree)
-        {
-            m_pool.emplace_back(std::make_unique<CTracer>(params.position));
-            idx = static_cast<int>(m_pool.size() - 1);
-            break;
-        }
-
-        IEntity* pEntity = gEnv->pEntitySystem->GetEntity(m_pool[i]->m_entityId);
-        if (pEntity && pEntity->IsHidden())
-        {
-            m_pool[i]->Reset(params.position);
-            idx = i;
-            break;
-        }
-        ++i;
-    }
-
-    m_lastFree = idx;
+    const size_t idx = CreateTracer(params);
     CTracer* tracer = m_pool[idx].get();
 
     if (params.geometry && params.geometry[0])
@@ -229,7 +205,29 @@ void CTracerManager::EmitTracer(const STracerParams& params)
         pEntity->Hide(false);
     }
 
-    m_actives.push_back(idx);
+    m_actives.push_back(static_cast<int>(idx));
+}
+
+size_t CTracerManager::CreateTracer(const STracerParams& params)
+{
+    IEntitySystem* pEntitySystem = gEnv->pEntitySystem;
+
+    // try to reuse an existing one
+    for (size_t i = 0; i < m_pool.size(); i++)
+    {
+        IEntity* pEntity = pEntitySystem->GetEntity(m_pool[i]->m_entityId);
+        if (pEntity && pEntity->IsHidden())
+        {
+            m_pool[i]->Reset(params.position);
+            ++m_numReused;
+            return i;
+        }
+    }
+
+    // create a new one
+    m_pool.emplace_back(std::make_unique<CTracer>(params.position));
+    ++m_numAllocated;
+    return m_pool.size() - 1;
 }
 
 void CTracerManager::Update(float frameTime)

Code/CryGame/Items/Weapons/TracerManager.h

@@ -68,15 +68,37 @@ class CTracerManager
     };
 
     void EmitTracer(const STracerParams& params);
+    size_t CreateTracer(const STracerParams& params);
     void Update(float frameTime);
     void Reset();
     void GetMemoryStatistics(ICrySizer*);
 
+    size_t GetPoolSize() const
+    {
+        return m_pool.size();
+    }
+
+    size_t GetActiveCount() const
+    {
+        return m_actives.size();
+    }
+
+    unsigned int GetNumReused() const 
+    { 
+        return m_numReused; 
+    }
+
+    unsigned int GetNumAllocated() const
+    { 
+        return m_numAllocated;
+    }
+
 private:
     std::vector<std::unique_ptr<CTracer>> m_pool;
     std::vector<int>                      m_updating;
     std::vector<int>                      m_actives;
-    int                                   m_lastFree = 0;
+    unsigned int m_numReused = 0;
+    unsigned int m_numAllocated = 0;
 };
 
 #endif //__TRACERMANAGER_H__

Code/CryGame/Items/Weapons/WeaponSystem.cpp

@@ -845,8 +845,7 @@ void CWeaponSystem::RemoveFromPool(CProjectile* pProjectile)
 		return;
 	}
 
-	std::erase_if(it->second.freeProjectiles, [&](const SmartProjectile& x) { return x.get() == pProjectile; });
-	it->second.totalCount--;
+	it->second.totalCount -= std::erase_if(it->second.freeProjectiles, [&](const SmartProjectile& x) { return x.get() == pProjectile; });
 }
 
 //------------------------------------------------------------------------
@@ -863,6 +862,20 @@ void CWeaponSystem::DumpPoolSizes()
 		CryLogAlways("%s: totalCount=%zu, freeCount=%zu", name, pool.totalCount, pool.freeProjectiles.size());
 	}
 
+	CryLogAlways("------------------------ Tracer Manager Statistics -----------------------------");
+
+	CTracerManager& pTracerMgr = GetTracerManager();
+
+	const size_t total = pTracerMgr.GetPoolSize();
+	const size_t actives = pTracerMgr.GetActiveCount();
+	const unsigned int reused = pTracerMgr.GetNumReused();
+	const unsigned int allocated = pTracerMgr.GetNumAllocated();
+
+	CryLogAlways("Total Allocated (in pool): %zu", total);
+	CryLogAlways("Currently Active: %zu", actives);
+	CryLogAlways("Reused: %u", reused);
+	CryLogAlways("Newly Spawned: %u", allocated);
+
 	CryLogAlways("--------------------------------------------------------------------------------");
 }