tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
Michael Bucari-Tovo 2021-08-13 23:18:52 -06:00
parent 7bdcf4eef0
commit 52fb0a27ce
2 changed files with 24 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
AaxDecrypter/NetworkFileStream.cs
View File

@ -435,5 +435,10 @@ namespace AaxDecrypter
} }
#endregion #endregion
~NetworkFileStream()
{
downloadEnded?.Close();
downloadedPiece?.Close();
}
} }
} }

57
LibationWinForms/SynchronizeInvoker.cs
View File

@ -8,11 +8,10 @@ namespace LibationWinForms
{ {
public bool InvokeRequired => Thread.CurrentThread.ManagedThreadId != InstanceThreadId; public bool InvokeRequired => Thread.CurrentThread.ManagedThreadId != InstanceThreadId;
private int InstanceThreadId { get; set; } = Thread.CurrentThread.ManagedThreadId; private int InstanceThreadId { get; set; } = Thread.CurrentThread.ManagedThreadId;
private SynchronizationContext SyncContext { get; init; } = SynchronizationContext.Current; private SynchronizationContext SyncContext { get; } = SynchronizationContext.Current;
public SynchronizeInvoker() public SynchronizeInvoker()
{ {
SyncContext = SynchronizationContext.Current;
if (SyncContext is null) if (SyncContext is null)
throw new NullReferenceException($"Could not capture a current {nameof(SynchronizationContext)}"); throw new NullReferenceException($"Could not capture a current {nameof(SynchronizationContext)}");
} }
@ -25,7 +24,7 @@ namespace LibationWinForms
if (InvokeRequired) if (InvokeRequired)
{ {
SyncContext.Post(ThreadMethodEntry.OnSendOrPostCallback, tme); SyncContext.Post(OnSendOrPostCallback, tme);
} }
else else
{ {
@ -38,7 +37,7 @@ namespace LibationWinForms
public object EndInvoke(IAsyncResult result) public object EndInvoke(IAsyncResult result)
{ {
if (result is not ThreadMethodEntry crossThread) if (result is not ThreadMethodEntry crossThread)
throw new ArgumentException($"{nameof(result)} was not returned by {nameof(BeginInvoke)}"); throw new ArgumentException($"{nameof(result)} was not returned by {nameof(SynchronizeInvoker)}.{nameof(BeginInvoke)}");
if (!crossThread.IsCompleted) if (!crossThread.IsCompleted)
crossThread.AsyncWaitHandle.WaitOne(); crossThread.AsyncWaitHandle.WaitOne();
@ -54,7 +53,7 @@ namespace LibationWinForms
if (InvokeRequired) if (InvokeRequired)
{ {
SyncContext.Send(ThreadMethodEntry.OnSendOrPostCallback, tme); SyncContext.Send(OnSendOrPostCallback, tme);
} }
else else
{ {
@ -65,49 +64,32 @@ namespace LibationWinForms
return tme.ReturnValue; return tme.ReturnValue;
} }
/// <summary>
/// This callback executes on the SynchronizationContext thread.
/// </summary>
private static void OnSendOrPostCallback(object asyncArgs)
{
var e = asyncArgs as ThreadMethodEntry;
e.Complete();
}
private class ThreadMethodEntry : IAsyncResult private class ThreadMethodEntry : IAsyncResult
{ {
public object AsyncState => null; public object AsyncState => null;
public bool CompletedSynchronously { get; internal set; } public bool CompletedSynchronously { get; internal set; }
public bool IsCompleted { get; private set; } public bool IsCompleted { get; private set; }
public object ReturnValue { get; private set; } public object ReturnValue { get; private set; }
public WaitHandle AsyncWaitHandle public WaitHandle AsyncWaitHandle => completedEvent;
{
get
{
if (resetEvent == null)
{
lock (invokeSyncObject)
{
if (resetEvent == null)
{
resetEvent = new ManualResetEvent(initialState: false);
}
}
}
return resetEvent;
}
}
private object invokeSyncObject = new object();
private Delegate method; private Delegate method;
private object[] args; private object[] args;
private ManualResetEvent resetEvent; private ManualResetEvent completedEvent;
public ThreadMethodEntry(Delegate method, object[] args) public ThreadMethodEntry(Delegate method, object[] args)
{ {
this.method = method; this.method = method;
this.args = args; this.args = args;
resetEvent = new ManualResetEvent(initialState: false); completedEvent = new ManualResetEvent(initialState: false);
}
/// <summary>
/// This callback executes on the SynchronizationContext thread.
/// </summary>
public static void OnSendOrPostCallback(object asyncArgs)
{
var e = asyncArgs as ThreadMethodEntry;
e.Complete();
} }
public void Complete() public void Complete()
@ -127,16 +109,13 @@ namespace LibationWinForms
finally finally
{ {
IsCompleted = true; IsCompleted = true;
resetEvent.Set(); completedEvent.Set();
} }
} }
~ThreadMethodEntry() ~ThreadMethodEntry()
{ {
if (resetEvent != null) completedEvent.Close();
{
resetEvent.Close();
}
} }
} }
} }