Exposed monotonic clock from ITimeProvider as @HCanber recommended in a…

…kkadotnet#846
kekekeks · Apr 19, 2015 · e81be8e · e81be8e
1 parent b476007
commit e81be8e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/src/core/Akka/Actor/Scheduler/DateTimeNowTimeProvider.cs b/src/core/Akka/Actor/Scheduler/DateTimeNowTimeProvider.cs
@@ -15,7 +15,11 @@ public class DateTimeOffsetNowTimeProvider : ITimeProvider, IDateTimeOffsetNowTi
         private DateTimeOffsetNowTimeProvider() { }
         public DateTimeOffset Now { get { return DateTimeOffset.UtcNow; } }
 
-        public static DateTimeOffsetNowTimeProvider Instance { get { return _instance; } }
+	    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/Util/MonotonicClock.cs b/src/core/Akka/Util/MonotonicClock.cs
@@ -4,7 +4,7 @@
 
 namespace Akka.Util
 {
-	public static class MonotonicClock
+	internal static class MonotonicClock
 	{
 		private static readonly Stopwatch Stopwatch = Stopwatch.StartNew();
 		private static readonly bool IsMono = Type.GetType("Mono.Runtime") != null;