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

Merge pull request #16673 from peppy/fix-polling-component-thread-safety

Browse Source 
Fix occasional non-fatal errors from polling API requests incorrectly getting queued twice
This commit is contained in:
Dan Balasescu 2022-01-28 16:26:47 +09:00 committed by GitHub
commit c7f8528d63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Online/PollingComponent.cs
View File

@ -2,8 +2,10 @@
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Diagnostics;
using System.Threading.Tasks;
using osu.Framework.Bindables;
using osu.Framework.Development;
using osu.Framework.Graphics.Containers;
using osu.Framework.Threading;
@ -66,6 +68,8 @@ namespace osu.Game.Online
private void doPoll()
{
Debug.Assert(ThreadSafety.IsUpdateThread);
scheduledPoll = null;
pollingActive = true;
Poll().ContinueWith(_ => pollComplete());
@ -96,13 +100,13 @@ namespace osu.Game.Online
if (!lastTimePolled.HasValue)
{
doPoll();
Scheduler.AddOnce(doPoll);
return;
}
if (Time.Current - lastTimePolled.Value > TimeBetweenPolls.Value)
{
doPoll();
Scheduler.AddOnce(doPoll);
return;
}

14
osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs
View File

@ -33,7 +33,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
});
}
private GetRoomsRequest pollReq;
private GetRoomsRequest lastPollRequest;
protected override Task Poll()
{
@ -45,10 +45,11 @@ namespace osu.Game.Screens.OnlinePlay.Components
var tcs = new TaskCompletionSource<bool>();
pollReq?.Cancel();
pollReq = new GetRoomsRequest(Filter.Value.Status, Filter.Value.Category);
lastPollRequest?.Cancel();
pollReq.Success += result =>
var req = new GetRoomsRequest(Filter.Value.Status, Filter.Value.Category);
req.Success += result =>
{
foreach (var existing in RoomManager.Rooms.ToArray())
{
@ -66,10 +67,11 @@ namespace osu.Game.Screens.OnlinePlay.Components
tcs.SetResult(true);
};
pollReq.Failure += _ => tcs.SetResult(false);
req.Failure += _ => tcs.SetResult(false);
API.Queue(pollReq);
API.Queue(req);
lastPollRequest = req;
return tcs.Task;
}
}

15
osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
this.room = room;
}
private GetRoomRequest pollReq;
private GetRoomRequest lastPollRequest;
protected override Task Poll()
{
@ -30,19 +30,22 @@ namespace osu.Game.Screens.OnlinePlay.Components
var tcs = new TaskCompletionSource<bool>();
pollReq?.Cancel();
pollReq = new GetRoomRequest(room.RoomID.Value.Value);
lastPollRequest?.Cancel();
pollReq.Success += result =>
var req = new GetRoomRequest(room.RoomID.Value.Value);
req.Success += result =>
{
result.RemoveExpiredPlaylistItems();
RoomManager.AddOrUpdateRoom(result);
tcs.SetResult(true);
};
pollReq.Failure += _ => tcs.SetResult(false);
req.Failure += _ => tcs.SetResult(false);
API.Queue(pollReq);
API.Queue(req);
lastPollRequest = req;
return tcs.Task;
}