Changeset 4135

Timestamp:

08/03/10 11:18:39 (14 years ago)

Author:

cneumuel

Message:

added HeuristicLab.Hive.Tracing (#1092)

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive

Files:

• HeuristicLab.Hive.Client.Core/3.3/Properties/AssemblyInfo.cs (deleted)
• HeuristicLab.Hive.Experiment.Views/3.3/Properties/AssemblyInfo.cs (deleted)
• HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs (modified) (4 diffs)
• HeuristicLab.Hive.Experiment/3.3/JobItem.cs (modified) (1 diff)
• HeuristicLab.Hive.Experiment/3.3/Properties/AssemblyInfo.cs (deleted)
• HeuristicLab.Hive.Server.Core/3.3/ClientCommunicator.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.3/Properties/AssemblyInfo.cs (deleted)
• HeuristicLab.Hive.Server.LINQDataAccess/3.3/HeuristicLab.Hive.Server.LINQDataAccess-3.3.csproj (modified) (1 diff)
• HeuristicLab.Hive.Tracing (added)
• HeuristicLab.Hive.Tracing/3.3 (added)
• HeuristicLab.Hive.Tracing/3.3/Properties (added)
• HeuristicLab.Hive.Tracing/3.3/Properties/AssemblyInfo.frame (added)
• HeuristicLab.Hive/3.3/HeuristicLab.Hive.log4net.xml (deleted)
• HeuristicLab.Hive/3.3/Properties/AssemblyInfo.cs (deleted)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs

@@ -270 +270 @@
     }
 
+    public void Stop() {
+      this.ExecutionState = Core.ExecutionState.Stopped;
+      foreach (JobItem jobItem in jobItems) {
+        AbortJob(jobItem.JobDto.Id);
+      }
+      OnStopped();
+    }
+
     private void CreateResultPollingThreads() {
       foreach(JobItem jobItem in JobItems) {
-        resultPollingThreads.Add(jobItem.JobDto.Id, CreateResultPollingThread(jobItem.JobDto));
+        if (!resultPollingThreads.ContainsKey(jobItem.JobDto.Id)) {
+          resultPollingThreads.Add(jobItem.JobDto.Id, CreateResultPollingThread(jobItem.JobDto));
+        }
       }
     }
@@ -280 +290 @@
       CreateResultPollingThreads();
       foreach (Thread pollingThread in resultPollingThreads.Values) {
-        pollingThread.Start();
+        if (pollingThread.ThreadState != System.Threading.ThreadState.Running) {
+          pollingThread.Start();
+        }
       }
       this.IsPollingResults = true;
@@ -317 +329 @@
     }
 
-    public void Stop() {
-      foreach(JobItem jobItem in jobItems) {
-        AbortJob(jobItem.JobDto.Id);
-      }
-    }
-
     public void AbortJob(Guid jobId) {
       IExecutionEngineFacade executionEngineFacade = GetExecutionEngineFacade();
-      executionEngineFacade.AbortJob(jobId);
-      resultPollingThreads[jobId].Interrupt();
-      GetJobItemById(jobId).LogMessage("Aborting Job");
-    }
+      Response response = executionEngineFacade.AbortJob(jobId);
+      GetJobItemById(jobId).LogMessage("Aborting Job: " + response.StatusMessage);
+    }
+
     #endregion
 
@@ -387 +393 @@
             GetJobItemById(job.Id).LogMessage("Response: " + response.StatusMessage);
 
-            if (response.Obj != null) {
-              UpdateJobItem(response.Obj);
-            }
+            UpdateJobItem(response.Obj);
+
+            if (response.Obj.State == State.Abort) {
+              // job is aborted, don't poll for results anymore
+              GetJobItemById(job.Id).LogMessage("Job successfully aborted");
+              return;
+            }            
 
             // loop while 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/JobItem.cs

@@ -18 +18 @@
     public override Image ItemImage {
       get {
-        if (jobDto.State == State.Offline) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
+        if (jobDto.State == State.Offline) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutablePrepared;
         else if (jobDto.State == State.Idle) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
         else if (jobDto.State == State.Calculating) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStarted;
         else if (jobDto.State == State.Offline) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
+        else if (jobDto.State == State.Abort) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
         else return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event;
       }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/ClientCommunicator.cs

@@ -318 +318 @@
     /// <summary>
     /// Process the Job progress sent by a client
+    /// [chn] this method needs to be refactored, because its a performance hog
+    /// 
+    /// what it does:
+    /// (1) find out if the jobs that should be calculated by this client (from db) and compare if they are consistent with what the joblist the client sent
+    /// (2) find out if every job from the joblist really should be calculated by this client
+    /// (3) checks if a job should be aborted and issues Message
+    /// (4) update job-progress and write to db
+    /// (5) if snapshot is requested, issue Message
+    /// 
+    /// (6) for each job from DB, check if there is a job from client (again).
+    /// (7) if job matches, it is removed from newAssigneJobs
+    /// (8) if job !matches, job's TTL is reduced by 1, 
+    /// (9) if TTL==0, job is set to Abort (save to DB), and Message to Abort job is issued to client
+    /// 
+    /// 
+    /// 
+    /// quirks:
+    /// (1) the response-object is modified during the foreach-loop (only last element counts)
+    /// (2) state Abort results in Finished. This should be: AbortRequested, Aborted.
     /// </summary>
     /// <param name="hbData"></param>

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/HeuristicLab.Hive.Server.LINQDataAccess-3.3.csproj

@@ -152 +152 @@
   </ItemGroup>
   <ItemGroup>
-    <Content Include="HiveDataContext.xml" />
+    <Content Include="HiveDataContext.xml">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />