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

Only run trace restrict programs if they contain relevant actions.

Browse Source 
Only run in pathfinder case if deny or penalty are present.
Only run in is safe waiting tile case is reserve through is present.
Presence is determined at program validation time and cached in the
program structure.
Validator now checks for unknown non-conditional instructions.
This commit is contained in:
Jonathan G Rennison
2015-09-02 18:35:56 +01:00
parent 06a1d7c5c9
commit e2435c7169
6 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/tracerestrict.cpp
View File

@@ -413,12 +413,14 @@ void TraceRestrictProgram::DecrementRefCount() {
/**
* Validate a instruction list
* Returns successful result if program seems OK
* This only validates that conditional nesting is correct, at present
* This only validates that conditional nesting is correct,
* and that all non-conditionals have a known type, at present
*/
CommandCost TraceRestrictProgram::Validate(const std::vector<TraceRestrictItem> &items) {
CommandCost TraceRestrictProgram::Validate(const std::vector<TraceRestrictItem> &items, TraceRestrictProgramActionsUsedFlags &actions_used_flags) {
// static to avoid needing to re-alloc/resize on each execution
static std::vector<TraceRestrictCondStackFlags> condstack;
condstack.clear();
actions_used_flags = static_cast<TraceRestrictProgramActionsUsedFlags>(0);
size_t size = items.size();
for (size_t i = 0; i < size; i++) {
@@ -462,6 +464,19 @@ CommandCost TraceRestrictProgram::Validate(const std::vector<TraceRestrictItem>
return_cmd_error(STR_TRACE_RESTRICT_ERROR_OFFSET_TOO_LARGE); // instruction ran off end
}
}
switch (GetTraceRestrictType(item)) {
case TRIT_PF_DENY:
case TRIT_PF_PENALTY:
actions_used_flags |= TRPAUF_PF;
break;
case TRIT_RESERVE_THROUGH:
actions_used_flags |= TRPAUF_RESERVE_THROUGH;
break;
default:
return_cmd_error(STR_TRACE_RESTRICT_ERROR_VALIDATE_UNKNOWN_INSTRUCTION);
}
}
}
if(!condstack.empty()) {
@@ -887,7 +902,8 @@ CommandCost CmdProgramSignalTraceRestrict(TileIndex tile, DoCommandFlag flags, u
break;
}
CommandCost validation_result = TraceRestrictProgram::Validate(items);
TraceRestrictProgramActionsUsedFlags actions_used_flags;
CommandCost validation_result = TraceRestrictProgram::Validate(items, actions_used_flags);
if (validation_result.Failed()) {
return validation_result;
}
@@ -897,6 +913,7 @@ CommandCost CmdProgramSignalTraceRestrict(TileIndex tile, DoCommandFlag flags, u
// move in modified program
prog->items.swap(items);
prog->actions_used_flags = actions_used_flags;
if (prog->items.size() == 0 && prog->refcount == 1) {
// program is empty, and this tile is the only reference to it