EQ2/Emu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Need to also track the not deleted to re-add after attempting a DeleteSpawns loop, need to also release the read lock if we continue

Browse Source
This commit is contained in:
Emagi 2025-07-01 07:54:58 -04:00
parent 40e83f5e2d
commit 93b7620364
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
source/WorldServer/zoneserver.cpp
View File

@ -1504,26 +1504,35 @@ void ZoneServer::AddPendingDelete(Spawn* spawn) {
} }
void ZoneServer::DeleteSpawns(bool delete_all) { void ZoneServer::DeleteSpawns(bool delete_all) {
// 1) Snapshot & clear delete‐list // 1) Snapshot & clear delete‐list
MSpawnDeleteList.writelock(__FUNCTION__, __LINE__); MSpawnDeleteList.writelock(__FUNCTION__, __LINE__);
std::vector<std::pair<Spawn*,int32>> to_process( std::vector<std::pair<Spawn*,int32>> to_process(
spawn_delete_list.begin(), spawn_delete_list.end() spawn_delete_list.begin(), spawn_delete_list.end()
); );
spawn_delete_list.clear(); spawn_delete_list.clear();
MSpawnDeleteList.releasewritelock(__FUNCTION__, __LINE__); MSpawnDeleteList.releasewritelock(__FUNCTION__, __LINE__);
// Prepare a list of entries we’ll need to keep around
std::vector<std::pair<Spawn*,int32>> to_keep;
to_keep.reserve(to_process.size());
MSpawnList.writelock(__FUNCTION__, __LINE__); MSpawnList.writelock(__FUNCTION__, __LINE__);
int32 current_time = Timer::GetCurrentTime2(); int32 current_time = Timer::GetCurrentTime2();
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;
if (!delete_all && current_time < when) if (!delete_all && current_time < when) {
continue; to_keep.emplace_back(entry);
continue;
}
MPendingSpawnRemoval.readlock(__FUNCTION__, __LINE__); MPendingSpawnRemoval.readlock(__FUNCTION__, __LINE__);
if(!delete_all && m_pendingSpawnRemove.count(spawn->GetID())) if(!delete_all && m_pendingSpawnRemove.count(spawn->GetID())) {
to_keep.emplace_back(entry);
MPendingSpawnRemoval.releasereadlock(__FUNCTION__, __LINE__);
continue; continue;
}
MPendingSpawnRemoval.releasereadlock(__FUNCTION__, __LINE__); MPendingSpawnRemoval.releasereadlock(__FUNCTION__, __LINE__);
lua_interface->SetLuaUserDataStale(spawn); lua_interface->SetLuaUserDataStale(spawn);
@ -1565,6 +1574,15 @@ void ZoneServer::DeleteSpawns(bool delete_all) {
safe_delete(spawn); safe_delete(spawn);
} }
MSpawnList.releasewritelock(__FUNCTION__, __LINE__); MSpawnList.releasewritelock(__FUNCTION__, __LINE__);
// Add all the kept entries
if (!to_keep.empty()) {
MSpawnDeleteList.writelock(__FUNCTION__, __LINE__);
for (auto &kv : to_keep) {
spawn_delete_list.emplace(kv.first, kv.second);
}
MSpawnDeleteList.releasewritelock(__FUNCTION__, __LINE__);
}
} }
void ZoneServer::AddDamagedSpawn(Spawn* spawn){ void ZoneServer::AddDamagedSpawn(Spawn* spawn){