epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Increase perf for parsing remote maps

Browse Source
This commit is contained in:
Gustas
2025-03-30 17:18:48 +03:00
committed by Paul Chote
parent d70c30763b
commit b4f3d8ae02
1 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
OpenRA.Game/Map/MapCache.cs
View File

@@ -14,6 +14,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using OpenRA.FileSystem; using OpenRA.FileSystem;
@@ -244,39 +245,61 @@ namespace OpenRA
{ {
var client = HttpClientFactory.Create(); var client = HttpClientFactory.Create();
var stringPool = new HashSet<string>(); // Reuse common strings in YAML var stringPool = new HashSet<string>(); // Reuse common strings in YAML
var buffer = new StringBuilder();
// Limit each query to 50 maps at a time to avoid request size limits // Limit each query to 50 maps at a time to avoid request size limits
for (var i = 0; i < queryUids.Count; i += 50) for (var i = 0; i < queryUids.Count; i += 50)
{ {
var batchUids = queryUids.Skip(i).Take(50).ToList(); var batchUids = queryUids.Skip(i).Take(50).ToList();
var url = repositoryUrl + "hash/" + string.Join(",", batchUids) + "/yaml"; var url = repositoryUrl + "hash/" + string.Join(",", batchUids) + "/yaml";
try
using (new PerfTimer("RemoteMapDetails"))
{ {
var httpResponseMessage = await client.GetAsync(url); try
var result = await httpResponseMessage.Content.ReadAsStreamAsync();
var yaml = MiniYaml.FromStream(result, url, stringPool: stringPool);
foreach (var kv in yaml)
previews[kv.Key].UpdateRemoteSearch(MapStatus.DownloadAvailable, kv.Value, modData.Manifest.MapCompatibility, mapDetailsReceived);
foreach (var uid in batchUids)
{ {
var p = previews[uid]; await using (var resultStream = await client.GetStreamAsync(url))
if (p.Status != MapStatus.DownloadAvailable) {
p.UpdateRemoteSearch(MapStatus.Unavailable, null, null); using (var resultReader = new StreamReader(resultStream))
{
while (true)
{
var line = await resultReader.ReadLineAsync();
if (line == null || !line.StartsWith('\t'))
{
var yaml = MiniYaml.FromString(buffer.ToString(), url, stringPool: stringPool);
buffer.Clear();
foreach (var kv in yaml)
previews[kv.Key].UpdateRemoteSearch(MapStatus.DownloadAvailable, kv.Value, modData.Manifest.MapCompatibility, mapDetailsReceived);
if (line == null)
break;
}
buffer.Append(line);
buffer.Append('\n');
}
}
}
foreach (var uid in batchUids)
{
var p = previews[uid];
if (p.Status != MapStatus.DownloadAvailable)
p.UpdateRemoteSearch(MapStatus.Unavailable, null, null);
}
} }
} catch (Exception e)
catch (Exception e)
{
Log.Write("debug", "Remote map query failed with error:");
Log.Write("debug", e);
Log.Write("debug", $"URL was: {url}");
foreach (var uid in batchUids)
{ {
var p = previews[uid]; Log.Write("debug", "Remote map query failed with error:");
p.UpdateRemoteSearch(MapStatus.Unavailable, null, null); Log.Write("debug", e);
mapQueryFailed?.Invoke(p); Log.Write("debug", $"URL was: {url}");
foreach (var uid in batchUids)
{
var p = previews[uid];
p.UpdateRemoteSearch(MapStatus.Unavailable, null, null);
mapQueryFailed?.Invoke(p);
}
} }
} }
} }