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

Interlocked.Read -> Volatile.Read

This commit is contained in:
Ben Adams 2016-10-07 00:59:31 +01:00
parent 29408956f9
commit 2adb6ff955
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,7 +171,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
// Called on Libuv thread // Called on Libuv thread
public void Tick(long timestamp) public void Tick(long timestamp)
{ {
if (timestamp > Interlocked.Read(ref _timeoutTimestamp)) if (timestamp > PlatformApis.VolatileRead(ref _timeoutTimestamp))
{ {
ConnectionControl.CancelTimeout(); ConnectionControl.CancelTimeout();

3
src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/DateHeaderValueManager.cs
View File

@ -6,6 +6,7 @@ using System.Text;
using System.Threading; using System.Threading;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure;
using Microsoft.Net.Http.Headers; using Microsoft.Net.Http.Headers;
using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking;
namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
{ {
@ -158,7 +159,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
} }
// No requests since the last timer tick, we need to check if we're beyond the idle threshold // No requests since the last timer tick, we need to check if we're beyond the idle threshold
if ((now.Ticks - Interlocked.Read(ref _lastRequestSeenTicks)) >= _timeWithoutRequestsUntilIdle.Ticks) if ((now.Ticks - PlatformApis.VolatileRead(ref _lastRequestSeenTicks)) >= _timeWithoutRequestsUntilIdle.Ticks)
{ {
// No requests since idle threshold so stop the timer if it's still running // No requests since idle threshold so stop the timer if it's still running
StopTimer(); StopTimer();

17
src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/PlatformApis.cs
View File

@ -1,7 +1,10 @@
// Copyright (c) .NET Foundation. All rights reserved. // 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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Threading;
namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking
{ {
@ -16,5 +19,19 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking
public static bool IsWindows { get; } public static bool IsWindows { get; }
public static bool IsDarwin { get; } public static bool IsDarwin { get; }
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static long VolatileRead(ref long value)
{
if (IntPtr.Size == 8)
{
return Volatile.Read(ref value);
}
else
{
// Avoid torn long reads on 32-bit
return Interlocked.Read(ref value);
}
}
} }
} }