Repository: reef Updated Branches: refs/heads/master 3850678e3 -> 3482ace88
[REEF-1371] Replace all use of RuntimeClock with IClock JIRA: [REEF-1371](https://issues.apache.org/jira/browse/REEF-1371) Pull request: This closes #1029 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/3482ace8 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/3482ace8 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/3482ace8 Branch: refs/heads/master Commit: 3482ace882a4f9e72c051f68c98e318246e2623c Parents: 3850678 Author: Mariia Mykhailova <[email protected]> Authored: Mon Jun 6 15:19:28 2016 -0700 Committer: Julia Wang <[email protected]> Committed: Wed Jun 8 10:47:57 2016 -0700 ---------------------------------------------------------------------- .../Poison/PoisonedEventHandler.cs | 6 +++--- .../Runtime/Evaluator/EvaluatorSettings.cs | 6 ++---- lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs | 5 ++--- lang/cs/Org.Apache.REEF.Wake.Tests/ClockTest.cs | 21 ++++++++++---------- 4 files changed, 18 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/3482ace8/lang/cs/Org.Apache.REEF.Common/Poison/PoisonedEventHandler.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Poison/PoisonedEventHandler.cs b/lang/cs/Org.Apache.REEF.Common/Poison/PoisonedEventHandler.cs index 474afa4..2717c72 100644 --- a/lang/cs/Org.Apache.REEF.Common/Poison/PoisonedEventHandler.cs +++ b/lang/cs/Org.Apache.REEF.Common/Poison/PoisonedEventHandler.cs @@ -19,9 +19,9 @@ using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Utilities.Attributes; using Org.Apache.REEF.Utilities.Logging; using Org.Apache.REEF.Wake.Time.Event; -using Org.Apache.REEF.Wake.Time.Runtime; using System; using System.Reactive; +using Org.Apache.REEF.Wake.Time; namespace Org.Apache.REEF.Common.Poison { @@ -37,7 +37,7 @@ namespace Org.Apache.REEF.Common.Poison private readonly double _crashProbability; private readonly int _crashTimeout; private readonly int _crashMinDelay; - private readonly RuntimeClock _clock; + private readonly IClock _clock; private readonly Random _rand = new Random(); @@ -46,7 +46,7 @@ namespace Org.Apache.REEF.Common.Poison [Parameter(typeof(CrashProbability))] double crashProbability, [Parameter(typeof(CrashTimeout))] int crashTimeout, [Parameter(typeof(CrashMinDelay))] int crashMinDelay, - RuntimeClock clock) + IClock clock) { _crashProbability = crashProbability; _crashTimeout = crashTimeout; http://git-wip-us.apache.org/repos/asf/reef/blob/3482ace8/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/EvaluatorSettings.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/EvaluatorSettings.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/EvaluatorSettings.cs index 62d5372..126ce02 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/EvaluatorSettings.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/EvaluatorSettings.cs @@ -21,11 +21,9 @@ using Org.Apache.REEF.Common.Protobuf.ReefProtocol; using Org.Apache.REEF.Common.Runtime.Evaluator.Parameters; using Org.Apache.REEF.Common.Runtime.Evaluator.Utils; using Org.Apache.REEF.Tang.Annotations; -using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Utilities.Logging; using Org.Apache.REEF.Wake.Remote; using Org.Apache.REEF.Wake.Time; -using Org.Apache.REEF.Wake.Time.Runtime; namespace Org.Apache.REEF.Common.Runtime.Evaluator { @@ -56,7 +54,7 @@ namespace Org.Apache.REEF.Common.Runtime.Evaluator [Parameter(typeof(EvaluatorIdentifier))] string evaluatorId, [Parameter(typeof(EvaluatorHeartbeatPeriodInMs))] int heartbeatPeriodInMs, [Parameter(typeof(HeartbeatMaxRetry))] int maxHeartbeatRetries, - RuntimeClock clock, + IClock clock, IRemoteManagerFactory remoteManagerFactory, REEFMessageCodec reefMessageCodec) : this(applicationId, evaluatorId, heartbeatPeriodInMs, maxHeartbeatRetries, @@ -70,7 +68,7 @@ namespace Org.Apache.REEF.Common.Runtime.Evaluator [Parameter(typeof(EvaluatorIdentifier))] string evaluatorId, [Parameter(typeof(EvaluatorHeartbeatPeriodInMs))] int heartbeatPeriodInMs, [Parameter(typeof(HeartbeatMaxRetry))] int maxHeartbeatRetries, - RuntimeClock clock, + IClock clock, IRemoteManagerFactory remoteManagerFactory, REEFMessageCodec reefMessageCodec, INameClient nameClient) http://git-wip-us.apache.org/repos/asf/reef/blob/3482ace8/lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs b/lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs index 5b5495c..4e1ba7b 100644 --- a/lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs +++ b/lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs @@ -33,7 +33,6 @@ using Org.Apache.REEF.Utilities.Diagnostics; using Org.Apache.REEF.Utilities.Logging; using Org.Apache.REEF.Wake.Time; using Org.Apache.REEF.Wake.Time.Parameters; -using Org.Apache.REEF.Wake.Time.Runtime; using Org.Apache.REEF.Wake.Time.Runtime.Event; namespace Org.Apache.REEF.Evaluator @@ -41,12 +40,12 @@ namespace Org.Apache.REEF.Evaluator public sealed class Evaluator { private static Logger logger = Logger.GetLogger(typeof(Evaluator)); - private readonly RuntimeClock _clock; + private readonly IClock _clock; private readonly EvaluatorExitLogger _evaluatorExitLogger; [Inject] private Evaluator( - RuntimeClock clock, + IClock clock, CustomTraceListeners customTraceListeners, CustomTraceLevel customTraceLevel, EvaluatorExitLogger evaluatorExitLogger) http://git-wip-us.apache.org/repos/asf/reef/blob/3482ace8/lang/cs/Org.Apache.REEF.Wake.Tests/ClockTest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Wake.Tests/ClockTest.cs b/lang/cs/Org.Apache.REEF.Wake.Tests/ClockTest.cs index 54c591e..558b3ac 100644 --- a/lang/cs/Org.Apache.REEF.Wake.Tests/ClockTest.cs +++ b/lang/cs/Org.Apache.REEF.Wake.Tests/ClockTest.cs @@ -23,6 +23,7 @@ using System.Threading; using System.Threading.Tasks; using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Util; +using Org.Apache.REEF.Wake.Time; using Org.Apache.REEF.Wake.Time.Event; using Org.Apache.REEF.Wake.Time.Runtime; using Xunit; @@ -34,7 +35,7 @@ namespace Org.Apache.REEF.Wake.Tests [Fact] public void TestClock() { - using (RuntimeClock clock = BuildClock()) + using (IClock clock = BuildClock()) { Task.Run(new Action(clock.Run)); @@ -49,7 +50,7 @@ namespace Org.Apache.REEF.Wake.Tests [Fact] public void TestAlarmRegistrationRaceConditions() { - using (RuntimeClock clock = BuildClock()) + using (IClock clock = BuildClock()) { Task.Run(new Action(clock.Run)); @@ -85,7 +86,7 @@ namespace Org.Apache.REEF.Wake.Tests [Fact] public void TestSimultaneousAlarms() { - using (RuntimeClock clock = BuildClock()) + using (IClock clock = BuildClock()) { Task.Run(new Action(clock.Run)); @@ -104,7 +105,7 @@ namespace Org.Apache.REEF.Wake.Tests [Fact] public void TestAlarmOrder() { - using (RuntimeClock clock = BuildLogicalClock()) + using (IClock clock = BuildLogicalClock()) { Task.Run(new Action(clock.Run)); @@ -122,30 +123,30 @@ namespace Org.Apache.REEF.Wake.Tests } } - private RuntimeClock BuildClock() + private IClock BuildClock() { var builder = TangFactory.GetTang().NewConfigurationBuilder(); return TangFactory.GetTang() .NewInjector(builder.Build()) - .GetInstance<RuntimeClock>(); + .GetInstance<IClock>(); } - private RuntimeClock BuildLogicalClock() + private IClock BuildLogicalClock() { var builder = TangFactory.GetTang().NewConfigurationBuilder(); builder.BindImplementation(GenericType<ITimer>.Class, GenericType<LogicalTimer>.Class); return TangFactory.GetTang() .NewInjector(builder.Build()) - .GetInstance<RuntimeClock>(); + .GetInstance<IClock>(); } private class HeartbeatObserver : IObserver<Alarm> { - private readonly RuntimeClock _clock; + private readonly IClock _clock; - public HeartbeatObserver(RuntimeClock clock) + public HeartbeatObserver(IClock clock) { _clock = clock; EventCount = 0;
