lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

smartthreadpool: ofc missed the relevant file

Browse Source
This commit is contained in:
UbitUmarov
2020-12-31 02:01:39 +00:00
parent 923d6437b8
commit 0389c02fd5
1 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
ThirdParty/SmartThreadPool/WorkItem.cs vendored
View File

@@ -64,7 +64,7 @@ namespace Amib.Threading.Internal
/// <summary>
/// Stores the caller's context
/// </summary>
private readonly CallerThreadContext _callerContext;
private ExecutionContext _callerContext = null;
/// <summary>
/// Holds the result of the mehtod
@@ -205,9 +205,13 @@ namespace Amib.Threading.Internal
_workItemsGroup = workItemsGroup;
_workItemInfo = workItemInfo;
if (_workItemInfo.UseCallerCallContext)
if (_workItemInfo.UseCallerCallContext && !ExecutionContext.IsFlowSuppressed())
{
_callerContext = CallerThreadContext.Capture(_workItemInfo.UseCallerCallContext);
ExecutionContext ec = ExecutionContext.Capture();
if(ec != null)
_callerContext = ec.CreateCopy();
ec.Dispose();
ec = null;
}
_callback = callback;
@@ -326,10 +330,7 @@ namespace Amib.Threading.Internal
{
try
{
if (null != _workItemCompletedEvent)
{
_workItemCompletedEvent(this);
}
_workItemCompletedEvent?.Invoke(this);
}
catch // Suppress exceptions
{ }
@@ -339,10 +340,7 @@ namespace Amib.Threading.Internal
{
try
{
if (null != _workItemStartedEvent)
{
_workItemStartedEvent(this);
}
_workItemStartedEvent?.Invoke(this);
}
catch // Suppress exceptions
{ }
@@ -353,13 +351,6 @@ namespace Amib.Threading.Internal
/// </summary>
private void ExecuteWorkItem()
{
CallerThreadContext ctc = null;
if (null != _callerContext)
{
ctc = CallerThreadContext.Capture(_callerContext.CapturedCallContext);
CallerThreadContext.Apply(_callerContext);
}
Exception exception = null;
object result = null;
@@ -367,7 +358,17 @@ namespace Amib.Threading.Internal
{
try
{
result = _callback(_state);
if(_callerContext == null)
result = _callback(_state);
else
{
ContextCallback _ccb = new ContextCallback( o =>
{
result =_callback(o);
});
ExecutionContext.Run(_callerContext, _ccb, _state);
}
}
catch (Exception e)
{
@@ -401,12 +402,6 @@ namespace Amib.Threading.Internal
}
}
if (null != _callerContext)
{
CallerThreadContext.Apply(ctc);
}
if (!SmartThreadPool.IsWorkItemCanceled)
{
SetResult(result, exception);
@@ -967,6 +962,12 @@ namespace Amib.Threading.Internal
public void DisposeOfState()
{
if(_callerContext != null)
{
_callerContext.Dispose();
_callerContext = null;
}
if (_workItemInfo.DisposeOfStateObjects)
{
IDisposable disp = _state as IDisposable;