Use TaskCompletionSource to async wait for population

ppy · Jun 11, 2024 · a19ab1c · a19ab1c
1 parent dd37749
commit a19ab1c
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/GlobalRankLookupCache/Controllers/BeatmapRankCache.cs b/GlobalRankLookupCache/Controllers/BeatmapRankCache.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Threading;
 
@@ -23,11 +22,13 @@ public BeatmapRankCache(int beatmapId, string highScoresTable)
 
         private DateTimeOffset lastPopulation;
 
-        private readonly ManualResetEventSlim populated = new ManualResetEventSlim();
+        private readonly TaskCompletionSource<bool> populated = new TaskCompletionSource<bool>();
 
         public async Task<(int position, int total)> Lookup(int score)
         {
-            if (!waitForPopulation())
+            bool success = await waitForPopulation();
+
+            if (!success)
             {
                 // do quick lookup
                 using (var db = await Program.GetDatabaseConnection())
@@ -60,14 +61,16 @@ public BeatmapRankCache(int beatmapId, string highScoresTable)
             return (scores.Count - (result < 0 ? ~result : result), scores.Count);
         }
 
-        private bool waitForPopulation()
+        private async Task<bool> waitForPopulation()
         {
-            if (populated.IsSet)
+            if (populated.Task.IsCompleted)
                 return true;
 
             queuePopulation();
 
-            return populated.Wait(1000);
+            await Task.WhenAny(Task.Delay(1000), populated.Task);
+
+            return populated.Task.IsCompleted;
         }
 
         private void queuePopulation()
@@ -127,7 +130,7 @@ private async Task repopulateScores()
                 }
 
                 Scores = scores;
-                populated.Set();
+                populated.SetResult(true);
                 lastPopulation = DateTimeOffset.Now;
             }
             catch