Changeset 3289 for trunk/sources/HeuristicLab.Core

Timestamp:

04/09/10 01:15:16 (14 years ago)

Author:

swagner

Message:

Implemented logs of engines (#963).

Location:

trunk/sources/HeuristicLab.Core/3.3

Files:

• Engine.cs (modified) (4 diffs)
• Executable.cs (modified) (1 diff)
• HeuristicLab.Core-3.3.csproj (modified) (1 diff)
• Interfaces/IEngine.cs (modified) (1 diff)
• Interfaces/ILog.cs (added)
• Log.cs (added)

trunk/sources/HeuristicLab.Core/3.3/Engine.cs

@@ -30 +30 @@
   public abstract class Engine : Executable, IEngine {
     [Storable]
+    protected ILog log;
+    public ILog Log {
+      get { return log; }
+    }
+
+    [Storable]
     private Stack<IOperation> executionStack;
     protected Stack<IOperation> ExecutionStack {
@@ -41 +47 @@
     protected Engine()
       : base() {
+      log = new Log();
       executionStack = new Stack<IOperation>();
+      pausePending = stopPending = false;
+      timer = new System.Timers.Timer(100);
+      timer.AutoReset = true;
+      timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Elapsed);
+    }
+    [StorableConstructor]
+    protected Engine(bool deserializing)
+      : base(deserializing) {
       pausePending = stopPending = false;
       timer = new System.Timers.Timer(100);
@@ -51 +66 @@
       if (ExecutionState == ExecutionState.Started) throw new InvalidOperationException(string.Format("Clone not allowed in execution state \"{0}\".", ExecutionState));
       Engine clone = (Engine)base.Clone(cloner);
+      clone.log = (ILog)cloner.Clone(log);
       IOperation[] contexts = executionStack.ToArray();
       for (int i = contexts.Length - 1; i >= 0; i--)
@@ -71 +87 @@
       OnPrepared();
     }
+    protected override void OnPrepared() {
+      Log.LogMessage("Engine prepared");
+      base.OnPrepared();
+    }
+
     public override void Start() {
       base.Start();
       ThreadPool.QueueUserWorkItem(new WaitCallback(Run), null);
     }
+    protected override void OnStarted() {
+      Log.LogMessage("Engine started");
+      base.OnStarted();
+    }
+
     public override void Pause() {
       base.Pause();
       pausePending = true;
     }
+    protected override void OnPaused() {
+      Log.LogMessage("Engine paused");
+      base.OnPaused();
+    }
+
     public override void Stop() {
       base.Stop();
       stopPending = true;
       if (ExecutionState == ExecutionState.Paused) OnStopped();
+    }
+    protected override void OnStopped() {
+      Log.LogMessage("Engine stopped");
+      base.OnStopped();
+    }
+
+    protected override void OnExceptionOccurred(Exception exception) {
+      Log.LogException(exception);
+      base.OnExceptionOccurred(exception);
     }
 

trunk/sources/HeuristicLab.Core/3.3/Executable.cs

@@ -59 +59 @@
       executionTime = TimeSpan.Zero;
     }
+    [StorableConstructor]
+    protected Executable(bool deserializing) : base(deserializing) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

trunk/sources/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

@@ -103 +103 @@
     <Compile Include="Attributes\CreatableAttribute.cs" />
     <None Include="HeuristicLabCorePlugin.cs.frame" />
+    <Compile Include="Log.cs" />
     <Compile Include="Executable.cs" />
     <Compile Include="ExecutionState.cs" />
+    <Compile Include="Interfaces\ILog.cs" />
     <Compile Include="Interfaces\IExecutable.cs" />
     <Compile Include="Interfaces\IParameterizedNamedItem.cs" />

trunk/sources/HeuristicLab.Core/3.3/Interfaces/IEngine.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using HeuristicLab.Common;
-
 namespace HeuristicLab.Core {
   public interface IEngine : IExecutable {
+    ILog Log { get; }
+
     void Prepare(IOperation initialOperation);
   }