Sky/eq2emu
Sky/eq2emu
1
0
Fork 0
Code

this seems to be better behavior with ASAN due to not constant locking/unlocking the spawn list..

Browse Source
This commit is contained in:
Emagi 2025-07-29 19:25:26 -04:00
parent 9e255408ce
commit e1a759a1a2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/WorldServer/zoneserver.cpp
View File

@ -1518,6 +1518,7 @@ void ZoneServer::DeleteSpawns(bool delete_all) {
to_keep.reserve(to_process.size()); to_keep.reserve(to_process.size());
int32 current_time = Timer::GetCurrentTime2(); int32 current_time = Timer::GetCurrentTime2();
MSpawnList.writelock(__FUNCTION__, __LINE__);
for (auto &entry : to_process) { for (auto &entry : to_process) {
Spawn* spawn = entry.first; Spawn* spawn = entry.first;
int32 when = entry.second; int32 when = entry.second;
@ -1552,7 +1553,6 @@ void ZoneServer::DeleteSpawns(bool delete_all) {
tmpNPC->SetBrain(nullptr); tmpNPC->SetBrain(nullptr);
} }
MSpawnList.writelock(__FUNCTION__, __LINE__);
std::map<int32, Spawn*>::iterator sitr = spawn_list.find(spawn->GetID()); std::map<int32, Spawn*>::iterator sitr = spawn_list.find(spawn->GetID());
if(sitr != spawn_list.end()) { if(sitr != spawn_list.end()) {
spawn_list.erase(sitr); spawn_list.erase(sitr);
@ -1573,8 +1573,8 @@ void ZoneServer::DeleteSpawns(bool delete_all) {
housing_spawn_map.erase(spawn->GetID()); housing_spawn_map.erase(spawn->GetID());
} }
safe_delete(spawn); safe_delete(spawn);
MSpawnList.releasewritelock(__FUNCTION__, __LINE__);
} }
MSpawnList.releasewritelock(__FUNCTION__, __LINE__);
// Add all the kept entries // Add all the kept entries
if (!to_keep.empty()) { if (!to_keep.empty()) {
@ -2010,7 +2010,7 @@ bool ZoneServer::SpawnProcess(){
// Delete unused spawns, do this last // Delete unused spawns, do this last
if(!zoneShuttingDown && checkRemove) if(!zoneShuttingDown)
DeleteSpawns(false); DeleteSpawns(false);
// Nothing should come after this // Nothing should come after this