Changeset 1509 for trunk/sources

Timestamp:

04/03/09 14:22:14 (16 years ago)

Author:

msteinbi

Message:

Added Interfaces for Execution Engine (#572)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/BusinessObjects/Client.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/Interfaces/IExecutionEngineFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/Interfaces/IJobManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Console/HiveServerManagementConsole.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/ExecutionEngineFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/JobManager.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/ServerConsoleFacade.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Hive.Contracts/BusinessObjects/Client.cs

@@ -28 +28 @@
 namespace HeuristicLab.Hive.Contracts.BusinessObjects {
 
-  public enum State { nullState, idle, calculating, offline, finished };
+  public enum State { nullState, idle, calculating, offline, finished, abort, requestSnapshot };
 
   [DataContract]

trunk/sources/HeuristicLab.Hive.Contracts/Interfaces/IExecutionEngineFacade.cs

@@ -32 +32 @@
     [OperationContract]
     ResponseObject<Job> AddJob(Job job);
+    [OperationContract]
+    Response RequestSnapshot(Guid jobId);
+    [OperationContract]
+    ResponseObject<JobResult> GetLastResult(Guid jobId, bool requested);
+    [OperationContract]
+    Response AbortJob(Guid jobId);
   }
 }

trunk/sources/HeuristicLab.Hive.Contracts/Interfaces/IJobManager.cs

@@ -40 +40 @@
     Response RemoveJob(Guid jobId);
     [OperationContract]
-    ResponseObject<JobResult> GetLastJobResultOf(Guid jobId);
+    ResponseObject<JobResult> GetLastJobResultOf(Guid jobId, bool requested);
+    [OperationContract]
+    Response RequestSnapshot(Guid jobId);
+    [OperationContract]
+    Response AbortJob(Guid jobId);
   }
 }

trunk/sources/HeuristicLab.Hive.Server.Console/HiveServerManagementConsole.cs

@@ -253 +253 @@
           IJobManager jobManager =
             ServiceLocator.GetJobManager();
-          ResponseObject<JobResult> jobRes = jobManager.GetLastJobResultOf(currentJob.Id);
+          ResponseObject<JobResult> jobRes = jobManager.GetLastJobResultOf(currentJob.Id, false);
           lblJobCalculationEnd.Text = "Calculation ended at " + jobRes.Obj.DateFinished;
         }

trunk/sources/HeuristicLab.Hive.Server.Core/ExecutionEngineFacade.cs

@@ -40 +40 @@
     }
 
+    public Response RequestSnapshot(Guid jobId) {
+      return jobManager.RequestSnapshot(jobId);
+    }
+
+    public ResponseObject<JobResult> GetLastResult(Guid jobId, bool requested) {
+      return jobManager.GetLastJobResultOf(jobId, requested);
+    }
+
+    public Response AbortJob(Guid jobId) {
+      return jobManager.AbortJob(jobId);
+    }
+
     #endregion
   }

trunk/sources/HeuristicLab.Hive.Server.Core/JobManager.cs

@@ -229 +229 @@
     }
 
-    public ResponseObject<JobResult> GetLastJobResultOf(Guid jobId) {
+    public ResponseObject<JobResult> GetLastJobResultOf(Guid jobId, bool requested) {
       ISession session = factory.GetSessionForCurrentThread();
 
@@ -249 +249 @@
     }
 
+    public Response RequestSnapshot(Guid jobId) {
+      ISession session = factory.GetSessionForCurrentThread();
+      Response response = new Response();
+      
+      try {
+        
+
+        return response;
+      }
+      finally {
+        if (session != null)
+          session.EndSession();
+      }
+    }
+
+    public Response AbortJob(Guid jobId) {
+      throw new NotImplementedException();
+    }
+
     #endregion
   }

trunk/sources/HeuristicLab.Hive.Server.Core/ServerConsoleFacade.cs

@@ -91 +91 @@
     }
 
-    public ResponseObject<JobResult> GetLastJobResultOf(Guid jobId) {
-      return jobManager.GetLastJobResultOf(jobId);
+    public ResponseObject<JobResult> GetLastJobResultOf(Guid jobId, bool requested) {
+      return jobManager.GetLastJobResultOf(jobId, requested);
     }
 
@@ -99 +99 @@
     }
 
+    public Response RequestSnapshot(Guid jobId) {
+      return jobManager.RequestSnapshot(jobId);
+    }
+
+    public Response AbortJob(Guid jobId) {
+      return jobManager.AbortJob(jobId);
+    }
+
     #endregion
   }