dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix template replacement cache update crash in RemoveAllGroupsForCompany

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-04-03 20:59:47 +01:00
parent e3e743ba1e
commit d82a050365
3 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/tbtr_template_vehicle.cpp
View File

@@ -47,6 +47,7 @@ INSTANTIATE_POOL_METHODS(TemplateReplacement)
robin_hood::unordered_flat_map<GroupID, TemplateID> _template_replacement_index;
robin_hood::unordered_flat_map<GroupID, TemplateID> _template_replacement_index_recursive;
static uint32 _template_replacement_index_recursive_guard = 0;
static void MarkTrainsInGroupAsPendingTemplateReplacement(GroupID gid, const TemplateVehicle *tv);
@@ -175,6 +176,8 @@ bool ShouldServiceTrainForTemplateReplacement(const Train *t, const TemplateVehi
static void MarkTrainsInGroupAsPendingTemplateReplacement(GroupID gid, const TemplateVehicle *tv)
{
if (_template_replacement_index_recursive_guard != 0) return;
std::vector<GroupID> groups;
groups.push_back(gid);
@@ -316,6 +319,11 @@ void ReindexTemplateReplacements()
void ReindexTemplateReplacementsRecursive()
{
if (_template_replacement_index_recursive_guard != 0) {
_template_replacement_index_recursive_guard |= 0x80000000;
return;
}
_template_replacement_index_recursive.clear();
for (const Group *group : Group::Iterate()) {
if (group->vehicle_type != VEH_TRAIN) continue;
@@ -333,8 +341,24 @@ void ReindexTemplateReplacementsRecursive()
}
}
ReindexTemplateReplacementsRecursiveGuard::ReindexTemplateReplacementsRecursiveGuard()
{
_template_replacement_index_recursive_guard++;
}
ReindexTemplateReplacementsRecursiveGuard::~ReindexTemplateReplacementsRecursiveGuard()
{
_template_replacement_index_recursive_guard--;
if (_template_replacement_index_recursive_guard == 0x80000000) {
_template_replacement_index_recursive_guard = 0;
ReindexTemplateReplacementsRecursive();
}
}
std::string ValidateTemplateReplacementCaches()
{
assert(_template_replacement_index_recursive_guard == 0);
robin_hood::unordered_flat_map<GroupID, TemplateID> saved_template_replacement_index = std::move(_template_replacement_index);
robin_hood::unordered_flat_map<GroupID, TemplateID> saved_template_replacement_index_recursive = std::move(_template_replacement_index_recursive);