pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Hotfix] Faction associations file naming / lock consistency

Browse Source
This commit is contained in:
Akkadius 2022-09-05 00:10:21 -05:00
parent d8134df679
commit da4bcbf736
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/shareddb.cpp
View File

@ -1507,7 +1507,7 @@ bool SharedDatabase::LoadFactionAssociation(const std::string &prefix)
try { try {
auto Config = EQEmuConfig::get(); auto Config = EQEmuConfig::get();
EQ::IPCMutex mutex("factionassociation"); EQ::IPCMutex mutex("factionassociations");
mutex.Lock(); mutex.Lock();
std::string file_name = Config->SharedMemDir + prefix + std::string("factionassociation"); std::string file_name = Config->SharedMemDir + prefix + std::string("factionassociation");
faction_associations_mmf = std::unique_ptr<EQ::MemoryMappedFile>(new EQ::MemoryMappedFile(file_name)); faction_associations_mmf = std::unique_ptr<EQ::MemoryMappedFile>(new EQ::MemoryMappedFile(file_name));

4
shared_memory/faction_association.cpp
View File

@ -25,7 +25,7 @@
#include "../common/faction.h" #include "../common/faction.h"
void LoadFactionAssociation(SharedDatabase *database, const std::string &prefix) { void LoadFactionAssociation(SharedDatabase *database, const std::string &prefix) {
EQ::IPCMutex mutex("factionassociation"); EQ::IPCMutex mutex("factionassociations");
mutex.Lock(); mutex.Lock();
uint32 lists = 0; uint32 lists = 0;
@ -35,7 +35,7 @@ void LoadFactionAssociation(SharedDatabase *database, const std::string &prefix)
uint32 size = static_cast<uint32>(EQ::FixedMemoryHashSet<FactionAssociations>::estimated_size(lists, max_list)); uint32 size = static_cast<uint32>(EQ::FixedMemoryHashSet<FactionAssociations>::estimated_size(lists, max_list));
auto Config = EQEmuConfig::get(); auto Config = EQEmuConfig::get();
std::string file_name = Config->SharedMemDir + prefix + std::string("factionassociation"); std::string file_name = Config->SharedMemDir + prefix + std::string("factionassociations");
EQ::MemoryMappedFile mmf(file_name, size); EQ::MemoryMappedFile mmf(file_name, size);
mmf.ZeroFile(); mmf.ZeroFile();