h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 07:43:00 +08:00
Code Issues Releases Wiki Activity

Add timeout for all ManualResetEventSlim.Wait invocations

Browse Source 
Timeout values were taken as best-guesses of upper values we'd expect
from sane execution.
This commit is contained in:
Dean Herbert 2022-06-23 14:33:20 +09:00
parent ed9c55a776
commit 7ef8b7df5f
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Benchmarks/BenchmarkRealmReads.cs
View File

@ -76,7 +76,7 @@ namespace osu.Game.Benchmarks
}
});
done.Wait();
done.Wait(60000);
}
[Benchmark]
@ -115,7 +115,7 @@ namespace osu.Game.Benchmarks
}
});
done.Wait();
done.Wait(60000);
}
[Benchmark]

4
osu.Game.Tests/Database/GeneralUsageTests.cs
View File

@ -79,11 +79,11 @@ namespace osu.Game.Tests.Database
{
hasThreadedUsage.Set();
stopThreadedUsage.Wait();
stopThreadedUsage.Wait(60000);
});
}, TaskCreationOptions.LongRunning | TaskCreationOptions.HideScheduler);
hasThreadedUsage.Wait();
hasThreadedUsage.Wait(60000);
Assert.Throws<TimeoutException>(() =>
{

2
osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableLoungeRoom.cs
View File

@ -46,7 +46,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
{
Task.Run(() =>
{
allowResponseCallback.Wait();
allowResponseCallback.Wait(10000);
allowResponseCallback.Reset();
Schedule(() => d?.Invoke("Incorrect password"));
});

2
osu.Game/Database/DatabaseContextFactory.cs
View File

@ -209,6 +209,6 @@ namespace osu.Game.Database
public void SetMigrationCompletion() => migrationComplete.Set();
public void WaitForMigrationCompletion() => migrationComplete.Wait();
public void WaitForMigrationCompletion() => migrationComplete.Wait(300000);
}
}

2
osu.Game/Graphics/ScreenshotManager.cs
View File

@ -103,7 +103,7 @@ namespace osu.Game.Graphics
framesWaitedEvent.Set();
}, 10, true);
framesWaitedEvent.Wait();
framesWaitedEvent.Wait(1000);
waitDelegate.Cancel();
}
}

3
osu.Game/OsuGameBase.cs
View File

@ -451,7 +451,8 @@ namespace osu.Game
readyToRun.Set();
}, false);
readyToRun.Wait();
if (!readyToRun.Wait(30000))
throw new TimeoutException("Attempting to block for migration took too long.");
bool? cleanupSucceded = (Storage as OsuStorage)?.Migrate(Host.GetStorage(path));