lineage2/L2Bot2.0
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: add lock to repositories

Browse Source
This commit is contained in:
k0t9i
2023-02-01 16:45:12 +04:00
parent 9a0204c6ed
commit 1bd107ad0a
4 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2BotDll/Versions/Interlude/Repositories/DropRepository.h
View File

@ -2,6 +2,7 @@
#include <map> #include <map>
#include <memory> #include <memory>
#include <shared_mutex>
#include "Domain/Repositories/EntityRepositoryInterface.h" #include "Domain/Repositories/EntityRepositoryInterface.h"
#include "Domain/DTO/EntityState.h" #include "Domain/DTO/EntityState.h"
#include "../Factories/DropFactory.h" #include "../Factories/DropFactory.h"
@ -18,6 +19,8 @@ namespace Interlude
public: public:
const std::vector<std::shared_ptr<DTO::EntityState>> GetEntities() override const std::vector<std::shared_ptr<DTO::EntityState>> GetEntities() override
{ {
std::unique_lock<std::shared_timed_mutex>(m_Mutex);
const std::map<uint32_t, Item*> items = FindAllObjects<Item*>(m_Radius, [this](float_t radius, int32_t prevId) { const std::map<uint32_t, Item*> items = FindAllObjects<Item*>(m_Radius, [this](float_t radius, int32_t prevId) {
return m_NetworkHandler.GetNextItem(radius, prevId); return m_NetworkHandler.GetNextItem(radius, prevId);
}); });
@ -37,6 +40,7 @@ namespace Interlude
void Reset() override void Reset() override
{ {
std::shared_lock<std::shared_timed_mutex>(m_Mutex);
m_Container.Reset(); m_Container.Reset();
} }
@ -57,5 +61,6 @@ namespace Interlude
const DropFactory& m_Factory; const DropFactory& m_Factory;
const uint16_t m_Radius; const uint16_t m_Radius;
EntityHandler& m_Container; EntityHandler& m_Container;
std::shared_timed_mutex m_Mutex;
}; };
} }

4
L2BotDll/Versions/Interlude/Repositories/HeroRepository.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <shared_mutex>
#include "Domain/Repositories/EntityRepositoryInterface.h" #include "Domain/Repositories/EntityRepositoryInterface.h"
#include "../Factories/HeroFactory.h" #include "../Factories/HeroFactory.h"
#include "../../../Events/EventDispatcher.h" #include "../../../Events/EventDispatcher.h"
@ -17,6 +18,7 @@ namespace Interlude
public: public:
const std::vector<std::shared_ptr<DTO::EntityState>> GetEntities() override const std::vector<std::shared_ptr<DTO::EntityState>> GetEntities() override
{ {
std::unique_lock<std::shared_timed_mutex>(m_Mutex);
auto hero = m_NetworkHandler.GetHero(); auto hero = m_NetworkHandler.GetHero();
@ -53,6 +55,7 @@ namespace Interlude
void Reset() override void Reset() override
{ {
std::shared_lock<std::shared_timed_mutex>(m_Mutex);
m_EntityHandler.Reset(); m_EntityHandler.Reset();
} }
@ -72,5 +75,6 @@ namespace Interlude
const NetworkHandlerWrapper& m_NetworkHandler; const NetworkHandlerWrapper& m_NetworkHandler;
User* m_PrevHero = nullptr; User* m_PrevHero = nullptr;
EntityHandler& m_EntityHandler; EntityHandler& m_EntityHandler;
std::shared_timed_mutex m_Mutex;
}; };
} }

5
L2BotDll/Versions/Interlude/Repositories/NPCRepository.h
View File

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <map> #include <map>
#include <shared_mutex>
#include "../GameStructs/NetworkHandlerWrapper.h" #include "../GameStructs/NetworkHandlerWrapper.h"
#include "Domain/Repositories/EntityRepositoryInterface.h" #include "Domain/Repositories/EntityRepositoryInterface.h"
#include "../Factories/NPCFactory.h" #include "../Factories/NPCFactory.h"
@ -19,6 +20,8 @@ namespace Interlude
public: public:
const std::vector<std::shared_ptr<DTO::EntityState>> GetEntities() override const std::vector<std::shared_ptr<DTO::EntityState>> GetEntities() override
{ {
std::unique_lock<std::shared_timed_mutex>(m_Mutex);
const auto creatures = FindAllObjects<User*>(m_Radius, [this](float_t radius, int32_t prevId) { const auto creatures = FindAllObjects<User*>(m_Radius, [this](float_t radius, int32_t prevId) {
return m_NetworkHandler.GetNextCreature(radius, prevId); return m_NetworkHandler.GetNextCreature(radius, prevId);
}); });
@ -49,6 +52,7 @@ namespace Interlude
void Reset() override void Reset() override
{ {
std::shared_lock<std::shared_timed_mutex>(m_Mutex);
m_EntityHandler.Reset(); m_EntityHandler.Reset();
} }
@ -112,5 +116,6 @@ namespace Interlude
const NetworkHandlerWrapper& m_NetworkHandler; const NetworkHandlerWrapper& m_NetworkHandler;
const uint16_t m_Radius = 0; const uint16_t m_Radius = 0;
EntityHandler& m_EntityHandler; EntityHandler& m_EntityHandler;
std::shared_timed_mutex m_Mutex;
}; };
} }

5
L2BotDll/Versions/Interlude/Repositories/PlayerRepository.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <map> #include <map>
#include <shared_mutex>
#include "Domain/Repositories/EntityRepositoryInterface.h" #include "Domain/Repositories/EntityRepositoryInterface.h"
#include "../Factories/PlayerFactory.h" #include "../Factories/PlayerFactory.h"
#include "../../GameStructs/FindObjectsTrait.h" #include "../../GameStructs/FindObjectsTrait.h"
@ -15,6 +16,8 @@ namespace Interlude
public: public:
const std::vector<std::shared_ptr<DTO::EntityState>> GetEntities() override const std::vector<std::shared_ptr<DTO::EntityState>> GetEntities() override
{ {
std::unique_lock<std::shared_timed_mutex>(m_Mutex);
const auto creatures = FindAllObjects<User*>(m_Radius, [this](float_t radius, int32_t prevId) { const auto creatures = FindAllObjects<User*>(m_Radius, [this](float_t radius, int32_t prevId) {
return m_NetworkHandler.GetNextCreature(radius, prevId); return m_NetworkHandler.GetNextCreature(radius, prevId);
}); });
@ -44,6 +47,7 @@ namespace Interlude
void Reset() override void Reset() override
{ {
std::shared_lock<std::shared_timed_mutex>(m_Mutex);
m_EntityHandler.Reset(); m_EntityHandler.Reset();
} }
@ -64,5 +68,6 @@ namespace Interlude
const NetworkHandlerWrapper& m_NetworkHandler; const NetworkHandlerWrapper& m_NetworkHandler;
const uint16_t m_Radius; const uint16_t m_Radius;
EntityHandler& m_EntityHandler; EntityHandler& m_EntityHandler;
std::shared_timed_mutex m_Mutex;
}; };
} }