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

Reverted ISystemClock to use DateTimeOffset

This commit is contained in:
Sunny Ahuwanya 2015-11-28 21:27:51 -05:00
parent 7f025a6bd4
commit 67a0f2d420
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Microsoft.AspNet.Server.Kestrel/Http/DateHeaderValueManager.cs
View File

@ -28,7 +28,6 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
private long _lastRequestSeenTicks; private long _lastRequestSeenTicks;
private long _lastReadDateTimeTicks; private long _lastReadDateTimeTicks;
private readonly bool _is64BitSystem; private readonly bool _is64BitSystem;
private readonly long _ticksInOneSecond;
private volatile bool _timerIsRunning; private volatile bool _timerIsRunning;
/// <summary> /// <summary>
@ -141,7 +140,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
private void TimerLoop(object state) private void TimerLoop(object state)
{ {
var now = _systemClock.UtcNow; var now = _systemClock.UtcNow;
var lastReadDateTime = new DateTime(ReadLongThreadSafe(ref _lastReadDateTimeTicks)); var lastReadDateTime = new DateTimeOffset(ReadLongThreadSafe(ref _lastReadDateTimeTicks), TimeSpan.Zero);
//Are we in a new second? //Are we in a new second?
if (now - lastReadDateTime >= TimeSpan.FromSeconds(1) || now.Second != lastReadDateTime.Second) if (now - lastReadDateTime >= TimeSpan.FromSeconds(1) || now.Second != lastReadDateTime.Second)
@ -189,8 +188,8 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
/// <summary> /// <summary>
/// Sets date values from a provided ticks value /// Sets date values from a provided ticks value
/// </summary> /// </summary>
/// <param name="ticks">A valid ticks value</param> /// <param name="value">A DateTimeOffset value</param>
private void SetDateValues(DateTime value) private void SetDateValues(DateTimeOffset value)
{ {
// See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.18 for required format of Date header // See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.18 for required format of Date header
_dateValue = value.ToString(Constants.RFC1123DateFormat); _dateValue = value.ToString(Constants.RFC1123DateFormat);

2
src/Microsoft.AspNet.Server.Kestrel/Infrastructure/ISystemClock.cs
View File

@ -13,6 +13,6 @@ namespace Microsoft.AspNet.Server.Kestrel.Infrastructure
/// <summary> /// <summary>
/// Retrieves the current system time in UTC. /// Retrieves the current system time in UTC.
/// </summary> /// </summary>
DateTime UtcNow { get; } DateTimeOffset UtcNow { get; }
} }
} }

4
src/Microsoft.AspNet.Server.Kestrel/Infrastructure/SystemClock.cs
View File

@ -13,11 +13,11 @@ namespace Microsoft.AspNet.Server.Kestrel.Infrastructure
/// <summary> /// <summary>
/// Retrieves the current system time in UTC. /// Retrieves the current system time in UTC.
/// </summary> /// </summary>
public DateTime UtcNow public DateTimeOffset UtcNow
{ {
get get
{ {
return DateTime.UtcNow; return DateTimeOffset.UtcNow;
} }
} }
} }