Changeset 6371 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

Timestamp:

06/06/11 18:33:03 (13 years ago)

Author:

ascheibe

Message:

#1233

• code cleanups for slave review
• added switch between privileged and unprivileged sandbox
• removed childjob management because it's not used

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified) (12 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -28 +28 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Hive;
 
 
@@ -34 +33 @@
   /// <summary>
   /// The core component of the Hive Slave. 
-  /// Handles commands sent from the Hive Server. 
+  /// Handles commands sent from the Hive Server and does all webservice calls for jobs. 
   /// </summary>
   public class Core : MarshalByRefObject {
@@ -41 +40 @@
       get { return heartbeatManager; }
     }
+
+    public EventLog ServiceEventLog { get; set; }
 
     private Semaphore waitShutdownSem = new Semaphore(0, 1);
@@ -51 +52 @@
     private PluginManager pluginManager;
 
-    public EventLog ServiceEventLog { get; set; }
-
     public Core() {
       var log = new ThreadSafeLog(new Log());
@@ -66 +65 @@
 
     /// <summary>
-    /// Main Method for the client
+    /// Main method for the client
     /// </summary>
     public void Start() {
@@ -72 +71 @@
 
       try {
-        //manager.Core = this;
-
         //start the client communication service (pipe between slave and slave gui)
         slaveComm = new ServiceHost(typeof(SlaveCommunicationService));
@@ -321 +318 @@
       this.jobManager.ExceptionOccured += new EventHandler<EventArgs<SlaveJob, Exception>>(jobManager_ExceptionOccured);
       this.jobManager.JobAborted += new EventHandler<EventArgs<SlaveJob>>(jobManager_JobAborted);
-      this.jobManager.NewChildJob += new EventHandler<EventArgs<SlaveJob, IJob>>(jobManager_NewChildJob);
-      this.jobManager.WaitForChildJobs += new EventHandler<EventArgs<SlaveJob, JobData>>(jobManager_WaitForChildJobs);
-      this.jobManager.DeleteChildJobs += new EventHandler<EventArgs<SlaveJob>>(jobManager_DeleteChildJobs);
     }
 
@@ -404 +398 @@
       SlaveStatusInfo.DecrementUsedCores(e.Value.CoresNeeded);
     }
-
-    private void jobManager_NewChildJob(object sender, EventArgs<SlaveJob, IJob> e) {
-      var job = new Job() { CoresNeeded = 1, MemoryNeeded = 0 };
-      WcfService.Instance.AddChildJob(e.Value.JobId, job, e.Value2);
-    }
-
-    private void jobManager_WaitForChildJobs(object sender, EventArgs<SlaveJob, JobData> e) {
-      try {
-        SlaveStatusInfo.DecrementUsedCores(e.Value.CoresNeeded);
-        heartbeatManager.AwakeHeartBeatThread();
-        Job job = wcfService.GetJob(e.Value.JobId);
-        if (job == null) throw new JobNotFoundException(e.Value.JobId);
-        job.ExecutionTime = e.Value.ExecutionTime;
-        job.IsParentJob = true;
-        job.FinishWhenChildJobsFinished = false;
-        JobData jobData = e.Value.GetJobData();
-        wcfService.UpdateJobData(job, jobData, configManager.GetClientInfo().Id, JobState.Waiting);
-      }
-      catch (JobNotFoundException ex) {
-        clientCom.LogMessage(ex.ToString());
-      }
-      catch (Exception ex) {
-        clientCom.LogMessage(ex.ToString());
-      }
-    }
-
-    private void jobManager_DeleteChildJobs(object sender, EventArgs<SlaveJob> e) {
-      try {
-        WcfService.Instance.DeleteChildJobs(e.Value.JobId);
-      }
-      catch (Exception ex) {
-        clientCom.LogMessage(ex.ToString());
-      }
-    }
     #endregion
 
@@ -491 +451 @@
     /// </summary>
     private void ShutdownCore() {
-      clientCom.LogMessage("Shutdown Signal received");
+      clientCom.LogMessage("Shutdown signal received");
       clientCom.LogMessage("Stopping heartbeat");
       heartbeatManager.StopHeartBeat();
       abortRequested = true;
+
+      DoAbortAll();
+
       clientCom.LogMessage("Logging out");
-
-      DoAbortAll();
-
       WcfService.Instance.Disconnect();
       clientCom.Shutdown();
@@ -514 +474 @@
       clientCom.LogMessage("Restart received");
       configManager.Asleep = false;
-      clientCom.LogMessage("Restart done");
     }
 
@@ -524 +483 @@
       clientCom.LogMessage("Sleep received - not accepting any new jobs");
       configManager.Asleep = true;
-      DoPauseAll();   
+      DoPauseAll();
     }
     #endregion