huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix deadlock in SocketOutput (#1278).

This commit is contained in:
Cesar Blum Silveira 2017-01-04 17:17:52 -08:00
parent 2351c1b558
commit 6d7ddc45ef
4 changed files with 119 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/SocketOutput.cs
View File

@ -169,7 +169,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
_tasksPending.Enqueue(new WaitingTask()
{
CancellationToken = cancellationToken,
CancellationRegistration = cancellationToken.Register(_connectionCancellation, this),
CancellationRegistration = cancellationToken.SafeRegister(_connectionCancellation, this),
BytesToWrite = buffer.Count,
CompletionSource = tcs
});

76
src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/CancellationTokenExtensions.cs Normal file
View File

@ -0,0 +1,76 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Threading;
namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure
{
internal static class CancellationTokenExtensions
{
public static IDisposable SafeRegister(this CancellationToken cancellationToken, Action<object> callback, object state)
{
var callbackWrapper = new CancellationCallbackWrapper(callback, state);
var registration = cancellationToken.Register(s => InvokeCallback(s), callbackWrapper);
var disposeCancellationState = new DisposeCancellationState(callbackWrapper, registration);
return new DisposableAction(s => Dispose(s), disposeCancellationState);
}
private static void InvokeCallback(object state)
{
((CancellationCallbackWrapper)state).TryInvoke();
}
private static void Dispose(object state)
{
((DisposeCancellationState)state).TryDispose();
}
private class DisposeCancellationState
{
private readonly CancellationCallbackWrapper _callbackWrapper;
private readonly CancellationTokenRegistration _registration;
public DisposeCancellationState(CancellationCallbackWrapper callbackWrapper, CancellationTokenRegistration registration)
{
_callbackWrapper = callbackWrapper;
_registration = registration;
}
public void TryDispose()
{
if (_callbackWrapper.TrySetInvoked())
{
_registration.Dispose();
}
}
}
private class CancellationCallbackWrapper
{
private readonly Action<object> _callback;
private readonly object _state;
private int _callbackInvoked;
public CancellationCallbackWrapper(Action<object> callback, object state)
{
_callback = callback;
_state = state;
}
public bool TrySetInvoked()
{
return Interlocked.Exchange(ref _callbackInvoked, 1) == 0;
}
public void TryInvoke()
{
if (TrySetInvoked())
{
_callback(_state);
}
}
}
}
}

40
src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/DisposableAction.cs Normal file
View File

@ -0,0 +1,40 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Threading;
namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure
{
internal class DisposableAction : IDisposable
{
public static readonly DisposableAction Empty = new DisposableAction(() => { });
private Action<object> _action;
private readonly object _state;
public DisposableAction(Action action)
: this(state => ((Action)state).Invoke(), state: action)
{
}
public DisposableAction(Action<object> action, object state)
{
_action = action;
_state = state;
}
protected virtual void Dispose(bool disposing)
{
if (disposing)
{
Interlocked.Exchange(ref _action, (state) => { }).Invoke(_state);
}
}
public void Dispose()
{
Dispose(true);
}
}
}

4
test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs
View File

@ -753,7 +753,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
Action<int> triggerNextCompleted;
Assert.True(completeQueue.TryDequeue(out triggerNextCompleted));
triggerNextCompleted(0);
await mockLibuv.OnPostTask;
await mockLibuv.OnPostTask;
Assert.True(writeCalled);
// Cleanup
@ -862,4 +862,4 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
}
}
}
}
}