warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Fixes libdeflate threading issue (#1813)

Browse source
This commit is contained in:
Kamron Batman 2024-06-02 15:02:47 -07:00 • committed by GitHub
parent aeba2261d2
commit a8d3d2773e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Projects/Server/Compression/Deflate.cs
View file

@ -20,16 +20,8 @@ namespace Server.Compression;
public static class Deflate public static class Deflate
{ {
public static LibDeflateBinding Standard { get; } [ThreadStatic]
private static LibDeflateBinding _standard;
static Deflate() public static LibDeflateBinding Standard => _standard ??= new LibDeflateBinding();
{
Standard = new LibDeflateBinding();
AppDomain.CurrentDomain.ProcessExit += CurrentDomain_ProcessExit;
}
private static void CurrentDomain_ProcessExit(object sender, EventArgs e)
{
Standard.Dispose();
}
} }

5
Projects/Server/Main.cs
View file

@ -25,6 +25,7 @@ using System.Text;
using System.Text.Json; using System.Text.Json;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Server.Compression;
using Server.Json; using Server.Json;
using Server.Logging; using Server.Logging;
using Server.Network; using Server.Network;
@ -465,6 +466,10 @@ public static class Core
Console.CancelKeyPress += Console_CancelKeyPressed; Console.CancelKeyPress += Console_CancelKeyPressed;
// LibDeflate is not thread safe, so we need to create a new instance for each thread
var standard = Deflate.Standard;
AppDomain.CurrentDomain.ProcessExit += (_, _) => standard.Dispose();
ServerConfiguration.Load(); ServerConfiguration.Load();
logger.Information("Running on {Framework}", RuntimeInformation.FrameworkDescription); logger.Information("Running on {Framework}", RuntimeInformation.FrameworkDescription);