DarthAffe/RGB.NET
1
0
Fork 0
mirror of https://github.com/DarthAffe/RGB.NET.git synced 2025-12-13 10:08:31 +00:00
Code Issues Releases Wiki Activity

Merge pull request #213 from DarthAffe/SDK/Wooting

Browse Source 
Wooting - Fixed race condition during SDK load/unload
This commit is contained in:
Robert Beekman 2021-05-13 19:45:33 +02:00 committed by GitHub
commit faf7535eaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RGB.NET.Devices.Wooting/Generic/WootingUpdateQueue.cs
View File

@ -27,6 +27,8 @@ namespace RGB.NET.Devices.Wooting.Generic
/// <inheritdoc />
protected override void Update(in ReadOnlySpan<(object key, Color color)> dataSet)
{
lock (_WootingSDK.SdkLock)
{
foreach ((object key, Color color) in dataSet)
{
@ -36,6 +38,7 @@ namespace RGB.NET.Devices.Wooting.Generic
_WootingSDK.ArrayUpdateKeyboard();
}
}
#endregion
}

12
RGB.NET.Devices.Wooting/Native/_WootingSDK.cs
View File

@ -16,6 +16,7 @@ namespace RGB.NET.Devices.Wooting.Native
#region Library management
private static IntPtr _dllHandle = IntPtr.Zero;
internal static object SdkLock = new();
/// <summary>
/// Reloads the SDK.
@ -52,6 +53,16 @@ namespace RGB.NET.Devices.Wooting.Native
{
if (_dllHandle == IntPtr.Zero) return;
Reset();
Close();
_getDeviceInfoPointer = null;
_keyboardConnectedPointer = null;
_arrayUpdateKeyboardPointer = null;
_arraySetSinglePointer = null;
_resetPointer = null;
_closePointer = null;
// ReSharper disable once EmptyEmbeddedStatement - DarthAffe 20.02.2016: We might need to reduce the internal reference counter more than once to set the library free
while (FreeLibrary(_dllHandle)) ;
_dllHandle = IntPtr.Zero;
@ -116,3 +127,4 @@ namespace RGB.NET.Devices.Wooting.Native
#endregion
}
}

12
RGB.NET.Devices.Wooting/WootingDeviceProvider.cs
View File

@ -54,11 +54,16 @@ namespace RGB.NET.Devices.Wooting
#region Methods
protected override void InitializeSDK()
{
lock (_WootingSDK.SdkLock)
{
_WootingSDK.Reload();
}
}
protected override IEnumerable<IRGBDevice> LoadDevices()
{
lock (_WootingSDK.SdkLock)
{
if (_WootingSDK.KeyboardConnected())
{
@ -76,18 +81,19 @@ namespace RGB.NET.Devices.Wooting
yield return device;
}
}
}
/// <inheritdoc />
public override void Dispose()
{
base.Dispose();
try { _WootingSDK.Close(); }
catch { /* Unlucky.. */ }
lock (_WootingSDK.SdkLock)
{
try { _WootingSDK.UnloadWootingSDK(); }
catch { /* at least we tried */ }
}
}
#endregion
}