Skip to content

Fix the connected tile drawer's timeout unit mismatch #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NayiemW wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −3
Open

Fix the connected tile drawer's timeout unit mismatch #323

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/TSMapEditor/Mutations/Classes/DrawConnectedTilesMutation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,14 @@ private struct ConnectedTileUndoData
public byte Level;
}

private const int MaxTimeInMilliseconds = 10;
// The stall watchdog resets whenever the search progresses, so a generous budget only
// extends genuinely stuck searches. The browser gets more time to compensate for the
// interpreted runtime's higher per-node cost and coarser timer granularity.
private static readonly int MaxTimeInMilliseconds = OperatingSystem.IsBrowser() ? 100 : 10;

// Stopwatch timestamps use Stopwatch.Frequency units, which differ per platform
// (they only coincide with TimeSpan's 100ns ticks on Windows).
private static readonly long MaxTimeInStopwatchTicks = Stopwatch.Frequency / 1000 * MaxTimeInMilliseconds;
private const float TileSizePenaltyPerFoundationCell = 0.07f;
private const int RepeatPenaltyAncestorWindow = 5;
private const float RepeatPenaltyPerWeightedUse = 0.75f;
Expand Down Expand Up @@ -101,7 +108,7 @@ private void FindConnectedTilePath(Point2D start, Point2D end, bool allowInstant
lastNode.Destination = end;
}

long timeoutTimestamp = Stopwatch.GetTimestamp() + TimeSpan.FromMilliseconds(MaxTimeInMilliseconds).Ticks;
long timeoutTimestamp = Stopwatch.GetTimestamp() + MaxTimeInStopwatchTicks;
openSet.Enqueue(lastNode, (GetNodePriorityScore(lastNode), lastNode.Tile?.ExtraPriority ?? 0));

while (openSet.Count > 0)
Expand All @@ -120,7 +127,7 @@ private void FindConnectedTilePath(Point2D start, Point2D end, bool allowInstant
{
bestNode = currentNode;
bestDistance = currentDistance;
timeoutTimestamp = Stopwatch.GetTimestamp() + TimeSpan.FromMilliseconds(MaxTimeInMilliseconds).Ticks;
timeoutTimestamp = Stopwatch.GetTimestamp() + MaxTimeInStopwatchTicks;
}

if (bestDistance == 0 || Stopwatch.GetTimestamp() > timeoutTimestamp)
Expand Down
Loading