ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-13 12:14:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Consistent BuildTask resolution timing

Browse source 
`BuildFontsImmediately` and `BuildFontsAsync` set `BuildTask` to completion at different point of build process, and changed the code to make it consistent that `BuildTask` is set to completion after `PromoteBuiltData` returns.
This commit is contained in:
Soreepeong 2024-01-23 23:18:18 +09:00
parent 871deca6e9
commit df89472d4c
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Dalamud/Interface/ManagedFontAtlas/Internals/FontAtlasFactory.Implementation.cs
View file

@ -4,6 +4,8 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Reactive.Disposables; using System.Reactive.Disposables;
using System.Runtime.ExceptionServices;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Dalamud.Interface.GameFonts; using Dalamud.Interface.GameFonts;
@ -229,7 +231,6 @@ internal sealed partial class FontAtlasFactory
private readonly GamePrebakedFontHandle.HandleManager gameFontHandleManager; private readonly GamePrebakedFontHandle.HandleManager gameFontHandleManager;
private readonly IFontHandleManager[] fontHandleManagers; private readonly IFontHandleManager[] fontHandleManagers;
private readonly object syncRootPostPromotion = new();
private readonly object syncRoot = new(); private readonly object syncRoot = new();
private Task<FontAtlasBuiltData?> buildTask = EmptyTask; private Task<FontAtlasBuiltData?> buildTask = EmptyTask;
@ -449,10 +450,9 @@ internal sealed partial class FontAtlasFactory
} }
var tcs = new TaskCompletionSource<FontAtlasBuiltData>(); var tcs = new TaskCompletionSource<FontAtlasBuiltData>();
int rebuildIndex;
try try
{ {
rebuildIndex = ++this.buildIndex; var rebuildIndex = Interlocked.Increment(ref this.buildIndex);
lock (this.syncRoot) lock (this.syncRoot)
{ {
if (!this.buildTask.IsCompleted) if (!this.buildTask.IsCompleted)
@ -469,11 +469,18 @@ internal sealed partial class FontAtlasFactory
var r = this.RebuildFontsPrivate(false, scale); var r = this.RebuildFontsPrivate(false, scale);
r.Wait(); r.Wait();
if (r.IsCompletedSuccessfully) if (r.IsCompletedSuccessfully)
{
this.PromoteBuiltData(rebuildIndex, r.Result, nameof(this.BuildFontsImmediately));
tcs.SetResult(r.Result); tcs.SetResult(r.Result);
else if (r.Exception is not null) }
tcs.SetException(r.Exception); else if ((r.Exception?.InnerException ?? r.Exception) is { } taskException)
{
ExceptionDispatchInfo.Capture(taskException).Throw();
}
else else
tcs.SetCanceled(); {
throw new OperationCanceledException();
}
} }
catch (Exception e) catch (Exception e)
{ {
@ -481,8 +488,6 @@ internal sealed partial class FontAtlasFactory
Log.Error(e, "[{name}] Failed to build fonts.", this.Name); Log.Error(e, "[{name}] Failed to build fonts.", this.Name);
throw; throw;
} }
this.InvokePostPromotion(rebuildIndex, tcs.Task.Result, nameof(this.BuildFontsImmediately));
} }
/// <inheritdoc/> /// <inheritdoc/>
@ -503,7 +508,7 @@ internal sealed partial class FontAtlasFactory
lock (this.syncRoot) lock (this.syncRoot)
{ {
var scale = this.IsGlobalScaled ? ImGuiHelpers.GlobalScaleSafe : 1f; var scale = this.IsGlobalScaled ? ImGuiHelpers.GlobalScaleSafe : 1f;
var rebuildIndex = ++this.buildIndex; var rebuildIndex = Interlocked.Increment(ref this.buildIndex);
return this.buildTask = this.buildTask.ContinueWith(BuildInner).Unwrap(); return this.buildTask = this.buildTask.ContinueWith(BuildInner).Unwrap();
async Task<FontAtlasBuiltData?> BuildInner(Task<FontAtlasBuiltData> unused) async Task<FontAtlasBuiltData?> BuildInner(Task<FontAtlasBuiltData> unused)
@ -519,14 +524,14 @@ internal sealed partial class FontAtlasFactory
if (res.Atlas.IsNull()) if (res.Atlas.IsNull())
return res; return res;
this.InvokePostPromotion(rebuildIndex, res, nameof(this.BuildFontsAsync)); this.PromoteBuiltData(rebuildIndex, res, nameof(this.BuildFontsAsync));
return res; return res;
} }
} }
} }
private void InvokePostPromotion(int rebuildIndex, FontAtlasBuiltData data, [UsedImplicitly] string source) private void PromoteBuiltData(int rebuildIndex, FontAtlasBuiltData data, [UsedImplicitly] string source)
{ {
// Capture the locks inside the lock block, so that the fonts are guaranteed to be the ones just built. // Capture the locks inside the lock block, so that the fonts are guaranteed to be the ones just built.
var fontsAndLocks = new List<(FontHandle FontHandle, IFontHandle.ImFontLocked Lock)>(); var fontsAndLocks = new List<(FontHandle FontHandle, IFontHandle.ImFontLocked Lock)>();