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

ioc: cancel all blocking Get()'s when unloading (#1772)

Browse source
This commit is contained in:
goat 2024-04-16 23:32:13 +02:00 • committed by GitHub
parent b1a8ec7615
commit cecb09dced
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Dalamud/ServiceManager.cs
View file

@ -43,6 +43,7 @@ internal static class ServiceManager
#endif
private static readonly TaskCompletionSource BlockingServicesLoadedTaskCompletionSource = new();
private static readonly CancellationTokenSource UnloadCancellationTokenSource = new();
private static ManualResetEvent unloadResetEvent = new(false);
@ -107,6 +108,12 @@ internal static class ServiceManager
/// Gets task that gets completed when all blocking early loading services are done loading.
/// </summary>
public static Task BlockingResolved { get; } = BlockingServicesLoadedTaskCompletionSource.Task;
/// <summary>
/// Gets a cancellation token that will be cancelled once Dalamud needs to unload, be it due to a failure state
/// during initialization or during regular operation.
/// </summary>
public static CancellationToken UnloadCancellationToken => UnloadCancellationTokenSource.Token;
/// <summary>
/// Initializes Provided Services and FFXIVClientStructs.
@ -374,6 +381,8 @@ internal static class ServiceManager
}
catch (Exception e)
{
UnloadCancellationTokenSource.Cancel();
Log.Error(e, "Failed resolving services");
try
{
@ -401,6 +410,8 @@ internal static class ServiceManager
/// </summary>
public static void UnloadAllServices()
{
UnloadCancellationTokenSource.Cancel();
var framework = Service<Framework>.GetNullable(Service<Framework>.ExceptionPropagationMode.None);
if (framework is { IsInFrameworkUpdateThread: false, IsFrameworkUnloading: false })
{

2
Dalamud/Service{T}.cs
View file

@ -116,7 +116,7 @@ internal static class Service<T> where T : IServiceType
#endif
if (!instanceTcs.Task.IsCompleted)
instanceTcs.Task.Wait();
instanceTcs.Task.Wait(ServiceManager.UnloadCancellationToken);
return instanceTcs.Task.Result;
}