Merge pull request #876 from kekekeks/monotonic-clock

Monotonic clock for #846
akkadotnet · Apr 27, 2015 · b505140 · b505140
2 parents 9210ebb + ab0c91f
commit b505140
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 0 deletions.
diff --git a/src/core/Akka/Actor/Scheduler/DateTimeNowTimeProvider.cs b/src/core/Akka/Actor/Scheduler/DateTimeNowTimeProvider.cs
@@ -15,6 +15,10 @@ public class DateTimeOffsetNowTimeProvider : ITimeProvider, IDateTimeOffsetNowTi
         private DateTimeOffsetNowTimeProvider() { }
         public DateTimeOffset Now { get { return DateTimeOffset.UtcNow; } }
 
+        public TimeSpan MonotonicClock {get { return Util.MonotonicClock.Elapsed; }}
+
+        public TimeSpan HighResMonotonicClock{get { return Util.MonotonicClock.ElapsedHighRes; }}
+
         public static DateTimeOffsetNowTimeProvider Instance { get { return _instance; } }
     }
 }

diff --git a/src/core/Akka/Actor/Scheduler/ITimeProvider.cs b/src/core/Akka/Actor/Scheduler/ITimeProvider.cs
@@ -15,6 +15,8 @@ public interface ITimeProvider
         /// Gets the scheduler's notion of current time.
         /// </summary>
         DateTimeOffset Now { get; }
+        TimeSpan MonotonicClock { get; }
+        TimeSpan HighResMonotonicClock { get; }
     }
 }
 
diff --git a/src/core/Akka/Actor/Scheduler/SchedulerBase.cs b/src/core/Akka/Actor/Scheduler/SchedulerBase.cs
@@ -69,7 +69,10 @@ void IActionScheduler.ScheduleRepeatedly(TimeSpan initialDelay, TimeSpan interva
 
         DateTimeOffset ITimeProvider.Now { get { return TimeNow; } }
 
+
         protected abstract DateTimeOffset TimeNow { get; }
+        public abstract TimeSpan MonotonicClock { get; }
+        public abstract TimeSpan HighResMonotonicClock { get; }
 
         protected abstract void InternalScheduleTellOnce(TimeSpan delay, ICanTell receiver, object message, IActorRef sender, ICancelable cancelable);
 

diff --git a/src/core/Akka/Actor/Scheduler/TaskBasedScheduler.cs b/src/core/Akka/Actor/Scheduler/TaskBasedScheduler.cs
@@ -18,6 +18,8 @@ public class TaskBasedScheduler : SchedulerBase, IDateTimeOffsetNowTimeProvider
     {
 
         protected override DateTimeOffset TimeNow { get { return DateTimeOffset.Now; } }
+        public override TimeSpan MonotonicClock { get { return Util.MonotonicClock.Elapsed; } }
+        public override TimeSpan HighResMonotonicClock { get { return Util.MonotonicClock.ElapsedHighRes; } }
 
         protected override void InternalScheduleTellOnce(TimeSpan delay, ICanTell receiver, object message, IActorRef sender, ICancelable cancelable)
         {

diff --git a/src/core/Akka/Akka.csproj b/src/core/Akka/Akka.csproj
@@ -247,6 +247,7 @@
     <Compile Include="Util\Internal\StringBuilderExtensions.cs" />
     <Compile Include="Util\Internal\TaskExtensions.cs" />
     <Compile Include="Util\ISurrogate.cs" />
+    <Compile Include="Util\MonotonicClock.cs" />
     <Compile Include="Util\StandardOutWriter.cs" />
     <Compile Include="Event\Subscription.cs" />
     <Compile Include="Event\TraceLogger.cs" />

diff --git a/src/core/Akka/Util/MonotonicClock.cs b/src/core/Akka/Util/MonotonicClock.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace Akka.Util
+{
+	internal static class MonotonicClock
+	{
+		private static readonly Stopwatch Stopwatch = Stopwatch.StartNew();
+		private static readonly bool IsMono = Type.GetType("Mono.Runtime") != null;
+		[DllImport("kernel32")]
+		private static extern ulong GetTickCount64();
+
+		private const int TicksInMillisecond = 10000;
+
+		public static TimeSpan Elapsed
+		{
+			get
+			{
+				return IsMono
+					? Stopwatch.Elapsed
+					: new TimeSpan((long) GetTickCount64()*TicksInMillisecond);
+			}
+		}
+
+		public static TimeSpan ElapsedHighRes
+		{
+			get { return Stopwatch.Elapsed; }
+		}
+	}
+}