From 318eb0353e97aa15a9d9a00bee2dff5faaceee09 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 29 Dec 2016 07:16:48 +0000 Subject: [PATCH] here's hoping these are enough --- .../serverDatabase/src/shared/Persister.cpp | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/engine/server/library/serverDatabase/src/shared/Persister.cpp b/engine/server/library/serverDatabase/src/shared/Persister.cpp index a28fb55e..e9d62df0 100755 --- a/engine/server/library/serverDatabase/src/shared/Persister.cpp +++ b/engine/server/library/serverDatabase/src/shared/Persister.cpp @@ -214,8 +214,6 @@ void Persister::update(real updateTime) void Persister::onFrameBarrierReached() { - pad.lock(); - if (m_newCharacterTaskQueue->getNumPendingTasks() == 0) { ServerSnapshotMap delayedSaves; @@ -281,8 +279,6 @@ void Persister::onFrameBarrierReached() taskQueue->report(); } } - - pad.unlock(); } // ---------------------------------------------------------------------- @@ -392,24 +388,16 @@ void Persister::startSave(void) */ Snapshot * Persister::getSnapshotForObject(const NetworkId &networkId, uint32 serverId) { - pad.lock(); - auto i = m_objectSnapshotMap.find(networkId); if (i!=m_objectSnapshotMap.end()) { NOT_NULL(i->second); - - pad.unlock(); - return i->second; } else { Snapshot *snap = getSnapshotForServer(serverId); m_objectSnapshotMap[networkId]=snap; - - pad.unlock(); - return snap; } } @@ -426,8 +414,6 @@ bool Persister::hasDataForObject(const NetworkId &objectId) const Snapshot *Persister::getSnapshotForServer(uint32 serverId) { - pad.lock(); - if (serverId==0) { if (!m_arbitraryGameDataSnapshot) @@ -435,9 +421,6 @@ Snapshot *Persister::getSnapshotForServer(uint32 serverId) m_arbitraryGameDataSnapshot = makeSnapshot(DB::ModeQuery::mode_UPDATE); m_currentSnapshots[0] = m_arbitraryGameDataSnapshot; } - - pad.unlock(); - return m_arbitraryGameDataSnapshot; } else @@ -452,18 +435,12 @@ Snapshot *Persister::getSnapshotForServer(uint32 serverId) if (!m_arbitraryGameDataSnapshot) { m_arbitraryGameDataSnapshot = snap; } - - pad.unlock(); - return snap; } else { NOT_NULL (j->second); - - pad.unlock(); - return j->second; } }