Changeset 6371

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

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Slave.ConsoleClient/Program.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave.ConsoleClient/SlaveCommListener.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon/MainWindow.Designer.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon/Program.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave.Tests (deleted)
• HeuristicLab.Clients.Hive.Slave.Views/3.4/JobsView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.Views/3.4/LogView.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveItem.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified) (12 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/DummyListener.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/Exceptions/InvalidStateException.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/Executor.cs (modified) (14 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/ExecutorMessage.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/ExecutorQueue.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLabClientsHiveSlavePlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/IPluginProvider.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/JobStatus.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/Manager/ConfigManager.cs (modified) (5 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/Manager/HeartbeatManager.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/Manager/JobManager.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/Manager/PluginManager.cs (modified) (5 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/MessageQueue.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/NetworkEnum.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/ServiceContracts/ISlaveCommunication.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/ServiceContracts/ISlaveCommunicationCallbacks.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/SlaveClientCom.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/SlaveCommunicationService.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/SlaveJob.cs (modified) (11 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/SlaveStatusInfo.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/StatusCommons.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs (modified) (8 diffs)
• HeuristicLab.Hive 3.4.sln (modified) (3 diffs)
• HeuristicLab.Hive/3.4/IJob.cs (modified) (4 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/Program.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.
@@ -23 +23 @@
 using System.Threading;
 
-
-
 namespace HeuristicLab.Clients.Hive.SlaveCore.ConsoleClient {
   public class Program {
     static void Main(string[] args) {
-      //mock the hive service for testing purposes
-      //ServiceLocator.Instance = new MockServiceLocator();
-
       //slave part
       Core core = new Core();
@@ -47 +42 @@
       listener.Close();
       core.Shutdown();
-      Console.ReadKey();
+      Console.ReadLine();
     }
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/SlaveCommListener.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.
@@ -29 +29 @@
 
   /// <summary>
-  /// mock a client, simply print out messages
+  /// Mock a client, simply print out messages
   /// </summary>
   [CallbackBehavior(ConcurrencyMode = ConcurrencyMode.Reentrant)]
@@ -75 +75 @@
 
     public void OnStatusChanged(StatusCommons status) {
-      string msg = string.Format( "{0}: {1}", DateTime.Now.ToString("HH:mm:ss"), status);
+      string msg = string.Format("{0}: {1}", DateTime.Now.ToString("HH:mm:ss"), status);
       Console.WriteLine(msg);
       debugOutput.WriteLine(msg);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon/MainWindow.Designer.cs

@@ -189 +189 @@
       this.tabAbout.Location = new System.Drawing.Point(4, 22);
       this.tabAbout.Name = "tabAbout";
-      this.tabAbout.Size = new System.Drawing.Size(577, 347);
+      this.tabAbout.Size = new System.Drawing.Size(597, 367);
       this.tabAbout.TabIndex = 2;
       this.tabAbout.Text = "About HeuristicLab Hive";
@@ -215 +215 @@
       this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
       this.Name = "MainWindow";
-      this.Text = "HeuristicLab Hive Slave View";
+      this.Text = "HeuristicLab Hive Slave";
       this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainWindow_FormClosing);
       this.contextMenuNotifyIcon.ResumeLayout(false);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon/Program.cs

@@ -25 +25 @@
         mw.RestoreFromTray();
       }
-      
 
       mw.Content = new SlaveItem();
-
       Application.Run();
     }
@@ -36 +34 @@
     /// (based on http://www.codeproject.com/KB/cs/processownersid.aspx)
     /// </summary>    
-    public static string GetProcessOwner(int pid) {
+    private static string GetProcessOwner(int pid) {
       string ownerSID = String.Empty;
       string processName = String.Empty;
@@ -59 +57 @@
 
     /// <summary>
-    /// kill all other slave tray icons, we only want 1 running at a time
+    /// Kill all other slave tray icons, we only want 1 running at a time
     /// (and if a newer version is installed the older one should be killed)
     /// </summary>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/JobsView.cs

@@ -52 +52 @@
       base.OnContentChanged();
       if (Content == null) {
-
       } else {
-
       }
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/LogView.cs

@@ -62 +62 @@
       base.OnContentChanged();
       if (Content == null) {
-        // TODO: Put code here when content is null
       } else {
-        // TODO: Put code here when content has been changed and is not null
       }
     }
@@ -70 +68 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      // TODO: Put code here to enable or disable controls based on whether the Content is/not null or the view is ReadOnly
     }
 
@@ -89 +86 @@
     }
     #endregion
-
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveItem.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Clients.Hive.SlaveCore.Views {
-
 
   public enum SlaveDisplayStat {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.cs

@@ -39 +39 @@
   [Content(typeof(SlaveItem), IsDefaultView = true)]
   public partial class SlaveView : ItemView {
+    private SlaveDisplayStat lastSlaveDisplayStat;
+    private const string serviceName = "HeuristicLab.Clients.Hive.SlaveCore.SlaveWindowsService";
 
     private const UInt32 BCM_SETSHIELD = 0x160C;
@@ -52 +54 @@
       }
     }
-
-    private SlaveDisplayStat lastSlaveDisplayStat;
 
     public SlaveView() {
@@ -241 +241 @@
 
     /// <summary>
-    /// shows the windows UAC dialog and restarts tray icon app
+    /// Shows the windows UAC dialog and restarts tray icon app
     /// </summary>
     private void ElevateApplication() {
-      // Launch itself as administrator
+      // launch itself as administrator
       ProcessStartInfo proc = new ProcessStartInfo(Application.ExecutablePath, "showui");
       proc.UseShellExecute = true;
@@ -262 +262 @@
 
     private void StartService() {
-      string serviceName = "HeuristicLab.Clients.Hive.SlaveCore.SlaveWindowsService";
       TimeSpan timeout = TimeSpan.FromMilliseconds(5000);
 
@@ -284 +283 @@
 
     private void StopService() {
-      string serviceName = "HeuristicLab.Clients.Hive.SlaveCore.SlaveWindowsService";
       TimeSpan timeout = TimeSpan.FromMilliseconds(7000);
 
@@ -329 +327 @@
       }
     }
-
-
   }
 }

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

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/DummyListener.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.

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Exceptions/InvalidStateException.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.

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Executor.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.
@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using HeuristicLab.Common;
@@ -28 +26 @@
 using HeuristicLab.Hive;
 
-
 namespace HeuristicLab.Clients.Hive.SlaveCore {
+  /// <summary>
+  /// The executor runs in the appdomain and handles the execution of an Hive job.
+  /// </summary>
   public class Executor : MarshalByRefObject, IDisposable {
     public Guid JobId { get; set; }
-    public IJob Job { get; set; }
+    private IJob Job { get; set; }
     public int CoresNeeded { get; set; }
     public int MemoryNeeded { get; set; }
     private bool wasJobAborted = false;
-    public Core Core { get; set; }
     private Semaphore pauseStopSem = new Semaphore(0, 1);
     private Semaphore startJobSem = new Semaphore(0, 1);
     //make pause or stop wait until start is finished
     private Semaphore jobStartedSem = new Semaphore(0, 1);
-
-    public ExecutorQueue executorQueue;
-
-    public bool SendHeartbeatForExecutor { get; set; } // Todo: get rid of??
+    private ExecutorQueue executorQueue;
+    public ExecutorQueue ExecutorCommandQueue {
+      get {
+        return executorQueue;
+      }
+    }
     public bool IsStopping { get; set; }
     public bool IsPausing { get; set; }
-
-    public DateTime CreationTime { get; set; }
-
+    private DateTime CreationTime { get; set; }
     private Exception currentException;
     public String CurrentException {
@@ -61 +60 @@
     }
 
-    public ExecutionState ExecutionState {
+    private ExecutionState ExecutionState {
       get {
         return Job != null ? Job.ExecutionState : HeuristicLab.Core.ExecutionState.Stopped;
@@ -74 +73 @@
 
     public Executor() {
-      SendHeartbeatForExecutor = true;
       IsStopping = false;
       IsPausing = false;
@@ -80 +78 @@
     }
 
-    /// <param name="serializedJob"></param>
-    /// <param name="collectChildJobs">if true, all child-jobs are downloaded and the job will be resumed.</param>
     public void Start(byte[] serializedJob) {
       try {
@@ -89 +85 @@
         RegisterJobEvents();
 
-        if (Job.CollectChildJobs) {
-          IEnumerable<JobData> childjobs = WcfService.Instance.GetChildJobs(JobId);
-          Job.Resume(childjobs.Select(j => PersistenceUtil.Deserialize<IJob>(j.Data)));
-        } else {
-          Job.Start();
-          if (!jobStartedSem.WaitOne(TimeSpan.FromSeconds(15))) {
-            throw new TimeoutException("Timeout when starting the job. JobStarted event was not fired.");
-          }
-          jobStartedSem.Release();
-        }
+        Job.Start();
+        if (!jobStartedSem.WaitOne(TimeSpan.FromSeconds(15))) {
+          throw new TimeoutException("Timeout when starting the job. JobStarted event was not fired.");
+        }
+        jobStartedSem.Release();
       }
       catch (Exception e) {
@@ -108 +99 @@
     public void Pause() {
       IsPausing = true;
-      SendHeartbeatForExecutor = false;
       // wait until job is started. if this does not happen, the Job is null an we give up
       jobStartedSem.WaitOne(TimeSpan.FromSeconds(15));
       if (Job == null) {
-        currentException = new Exception("Pausing job " + this.JobId + ": Job is null"); // Todo: use more specific exception
+        currentException = new Exception("Pausing job " + this.JobId + ": Job is null");
         return;
       }
@@ -123 +113 @@
         }
         catch (Exception ex) {
-          currentException = new Exception("Error pausing job " + this.JobId + ": " + ex.ToString()); // Todo: use more specific exception
+          currentException = new Exception("Error pausing job " + this.JobId + ": " + ex.ToString());
         }
       }
@@ -130 +120 @@
     public void Stop() {
       IsStopping = true;
-      SendHeartbeatForExecutor = false;
       // wait until job is started. if this does not happen, the Job is null an we give up
       jobStartedSem.WaitOne(TimeSpan.FromSeconds(15));
       if (Job == null) {
-        currentException = new Exception("Stopping job " + this.JobId + ": Job is null"); // Todo: use more specific exception
+        currentException = new Exception("Stopping job " + this.JobId + ": Job is null");
       }
       wasJobAborted = true;
@@ -144 +133 @@
         }
         catch (Exception ex) {
-          currentException = new Exception("Error stopping job " + this.JobId + ": " + ex.ToString()); // Todo: use more specific exception
+          currentException = new Exception("Error stopping job " + this.JobId + ": " + ex.ToString());
         }
       }
@@ -152 +141 @@
       Job.JobStopped += new EventHandler(Job_JobStopped);
       Job.JobFailed += new EventHandler(Job_JobFailed);
-      Job.NewChildJob += new EventHandler<EventArgs<IJob>>(Job_NewChildJob);
-      Job.WaitForChildJobs += new EventHandler(Job_WaitForChildJobs);
-      Job.DeleteChildJobs += new EventHandler(Job_DeleteChildJobs);
       Job.JobPaused += new EventHandler(Job_JobPaused);
       Job.JobStarted += new EventHandler(Job_JobStarted);
@@ -162 +148 @@
       Job.JobStopped -= new EventHandler(Job_JobStopped);
       Job.JobFailed -= new EventHandler(Job_JobFailed);
-      Job.NewChildJob -= new EventHandler<EventArgs<IJob>>(Job_NewChildJob);
-      Job.WaitForChildJobs -= new EventHandler(Job_WaitForChildJobs);
-      Job.DeleteChildJobs -= new EventHandler(Job_DeleteChildJobs);
       Job.JobPaused -= new EventHandler(Job_JobPaused);
       Job.JobStarted -= new EventHandler(Job_JobStarted);
@@ -170 +153 @@
 
     #region Job Events
-    private void Job_NewChildJob(object sender, EventArgs<IJob> e) {
-      //JobData childJobData = new JobData();
-      //IEnumerable<Type> types;
-      //childJobData.Data = PersistenceUtil.Serialize(e.Value, out types);
-      //IEnumerable<Plugin> plugins;
-      //PluginUtil.CollectDeclaringPlugins
-
-      //Job childJob = new Job();
-      //childJob.CoresNeeded = 1;
-      //childJob.MemoryNeeded = 0;
-      //childJob.PluginsNeededIds = FindPluginsNeeded(e.Value);
-
-      //ExecutorMessage msg = new ExecutorMessage(ExecutorMessageType.NewChildJob);
-      //msg.MsgData = childJobData;
-      //msg.MsgJob = childJob;
-
-      //executorQueue.AddMessage(msg);
-      
-      executorQueue.AddMessage(new JobExecutorMessage(ExecutorMessageType.NewChildJob, e.Value));
-    }
-
-    private void Job_WaitForChildJobs(object sender, EventArgs e) {
-      // Pause the job and send it back to the hive. The server will awake it when all child-jobs are finished
-      this.Job.CollectChildJobs = true;
-
-      //JobData jdata = new JobData();
-      //jdata.Data = PersistenceUtil.Serialize(Job);
-      //jdata.JobId = this.JobId;
-
-      //ExecutorMessage msg = new ExecutorMessage(ExecutorMessageType.WaitForChildJobs);
-      //msg.MsgData = jdata;
-      //executorQueue.AddMessage(msg);
-
-      executorQueue.AddMessage(new ExecutorMessage(ExecutorMessageType.WaitForChildJobs));
-    }
-
-    private void Job_DeleteChildJobs(object sender, EventArgs e) {
-      executorQueue.AddMessage(ExecutorMessageType.DeleteChildJobs);
-    }
-
     private void Job_JobFailed(object sender, EventArgs e) {
       EventArgs<Exception> ex = (EventArgs<Exception>)e;

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

@@ -1 @@
-
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
 using System;
-using HeuristicLab.Hive;
+
 namespace HeuristicLab.Clients.Hive.SlaveCore {
+
   [Serializable]
   public enum ExecutorMessageType {
@@ -9 +30 @@
     JobStopped,
     JobFailed,
-    NewChildJob,
-    WaitForChildJobs,
-    DeleteChildJobs,
     StopExecutorMonitoringThread
   }
@@ -23 +41 @@
     }
   }
-
-  [Serializable]
-  public class JobExecutorMessage : ExecutorMessage {
-    public IJob Job { get; private set; }
-
-    public JobExecutorMessage(ExecutorMessageType messageType, IJob job) : base(messageType) {
-      this.Job = job;
-    }
-  }
 }

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

@@ -1 @@
-
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
 using System;
 using System.Collections.Generic;
 using System.Threading;
+
 namespace HeuristicLab.Clients.Hive.SlaveCore {
-
+  /// <summary>
+  /// Every Executor gets an ExecutorQueue in which it can push messages. 
+  /// These messages are then read and processed from outside the appdomain.
+  /// </summary>
   public class ExecutorQueue : MarshalByRefObject {
     private Queue<ExecutorMessage> queue = null;
     private Semaphore semaphore = null;
 
-    /// <summary>
-    /// Creates a new MessageQueue Object.
-    /// A new Queue and a Semaphore is created. The Semaphore is set to a max size of 5000.
-    /// </summary>
     public ExecutorQueue() {
       queue = new Queue<ExecutorMessage>();

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLabClientsHiveSlavePlugin.cs.frame

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+
+using System;
 using System.Collections.Generic;
 using System.Linq;

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

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/JobStatus.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.

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Manager/ConfigManager.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.
@@ -39 +39 @@
 
     /// <summary>
-    /// if the Sleeping is true, the Slave won't accept any new jobs
+    /// if Asleep is true, the Slave won't accept any new jobs
     /// </summary>
     public bool Asleep { get; set; }
-
-    //public Core Core { get; set; }
     private JobManager jobManager;
     private Slave slave;
@@ -111 +109 @@
     public Dictionary<Guid, TimeSpan> GetExecutionTimeOfAllJobs() {
       Dictionary<Guid, TimeSpan> prog = new Dictionary<Guid, TimeSpan>();
-
-      //lock (slaveJobs) {
-      //  foreach (KeyValuePair<Guid, SlaveJob> kvp in slaveJobs) {
-      //    Executor e = kvp.Value.JobExecutor;
-      //    if (e != null && !kvp.Value.Finished) {
-      //      //don't include jobs in hb's which are currently serializing
-      //      if (e.SendHeartbeatForExecutor) {
-      //        prog[e.JobId] = e.ExecutionTime;
-      //      }
-      //    }
-      //  }
-      //}
       prog = jobManager.GetExecutionTimes();
-
       return prog;
     }
@@ -159 +144 @@
 
     /// <summary>
-    /// Generate a guid based on mac address of the first found nic (yes, mac addresses are not unique...).
+    /// Generate a guid based on mac address of the first found nic (yes, mac addresses are not unique...)
+    /// and the machine name.
     /// Format:
     /// 
@@ -169 +155 @@
     /// The mac address is saved in the last 48 bits of the Data 4 segment 
     /// of the guid (first 2 bytes of Data 4 are reserved).
-    /// D1 contains the name of the machine. 
+    /// D1 contains the hash of the machinename. 
     /// </summary>    
     private static Guid GetUniqueMachineIdFromMac() {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Manager/HeartbeatManager.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.
@@ -27 +27 @@
 namespace HeuristicLab.Clients.Hive.SlaveCore {
   /// <summary>
-  /// Heartbeat class. It sends every x ms a heartbeat to the server and receives a Message
+  /// Heartbeat Manager sends every x ms a heartbeat to the server and receives a message.
+  /// The message is added to the MessageQueue from where the Core pulls them and decides what to do.
   /// </summary>
   public class HeartbeatManager {
@@ -86 +87 @@
             if (wcfService.ConnState == NetworkEnum.WcfConnState.Connected) {
               Slave info = ConfigManager.Instance.GetClientInfo();
-              
+
               Heartbeat heartBeatData = new Heartbeat {
                 SlaveId = info.Id,
@@ -120 +121 @@
     }
 
-
     #region Eventhandler
     public event EventHandler<EventArgs<Exception>> ExceptionOccured;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Manager/JobManager.cs

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Hive;
 
 namespace HeuristicLab.Clients.Hive.SlaveCore {
+
+  /// <summary>
+  /// Holds a list of slave jobs and manages access to this list. 
+  /// Forwards events from SlaveJob and forwards commands to SlaveJob. 
+  /// </summary>
   public class JobManager {
     private static ReaderWriterLockSlim slaveJobsLocker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
@@ -164 +168 @@
       finally { slaveJobsLocker.ExitWriteLock(); }
     }
+
     private void RemoveSlaveJob(Guid jobId, SlaveJob slaveJob) {
       slaveJobsLocker.EnterWriteLock();
@@ -181 +186 @@
       slaveJob.JobFailed += new EventHandler<EventArgs<Guid, Exception>>(slaveJob_JobFailed);
       slaveJob.ExceptionOccured += new EventHandler<EventArgs<Guid, Exception>>(slaveJob_ExceptionOccured);
-      slaveJob.NewChildJob += new EventHandler<EventArgs<Guid, HeuristicLab.Hive.IJob>>(slaveJob_NewChildJob);
-      slaveJob.WaitForChildJobs += new EventHandler<EventArgs<Guid>>(slaveJob_WaitForChildJobs);
-      slaveJob.DeleteChildJobs += new EventHandler<EventArgs<Guid>>(slaveJob_DeleteChildJobs);
     }
 
@@ -192 +194 @@
       slaveJob.JobFailed -= new EventHandler<EventArgs<Guid, Exception>>(slaveJob_JobFailed);
       slaveJob.ExceptionOccured -= new EventHandler<EventArgs<Guid, Exception>>(slaveJob_ExceptionOccured);
-      slaveJob.NewChildJob -= new EventHandler<EventArgs<Guid, HeuristicLab.Hive.IJob>>(slaveJob_NewChildJob);
-      slaveJob.WaitForChildJobs -= new EventHandler<EventArgs<Guid>>(slaveJob_WaitForChildJobs);
-      slaveJob.DeleteChildJobs -= new EventHandler<EventArgs<Guid>>(slaveJob_DeleteChildJobs);
     }
 
@@ -285 +284 @@
       SlaveStatusInfo.IncrementExceptionOccured();
       OnExceptionOccured(slaveJob, e.Value2);
-    }
-
-    private void slaveJob_NewChildJob(object sender, EventArgs<Guid, IJob> e) {
-      var slaveJob = slaveJobs[e.Value];
-      OnNewChildJob(slaveJob, e.Value2);
-    }
-
-    private void slaveJob_WaitForChildJobs(object sender, EventArgs<Guid> e) {
-      SlaveJob slaveJob;
-      slaveJobsLocker.EnterUpgradeableReadLock();
-      try {
-        slaveJob = slaveJobs[e.Value];
-        RemoveSlaveJob(e.Value, slaveJob);
-      }
-      finally { slaveJobsLocker.ExitUpgradeableReadLock(); }
-
-      JobData jobData = null;
-      try {
-        jobData = slaveJob.GetJobData();
-        if (jobData == null) throw new SerializationException();
-        SlaveStatusInfo.IncrementJobsFinished();
-        OnWaitForChildJobs(slaveJob, jobData);
-      }
-      catch (Exception ex) {
-        RemoveSlaveJob(e.Value, slaveJob);
-        SlaveStatusInfo.IncrementJobsFailed();
-        OnJobFailed(slaveJob, jobData, ex);
-      }
-    }
-
-    private void slaveJob_DeleteChildJobs(object sender, EventArgs<Guid> e) {
-      var slaveJob = slaveJobs[e.Value];
-      OnDeleteChildJobs(slaveJob);
     }
     #endregion
@@ -357 +323 @@
       if (handler != null) handler(this, new EventArgs<SlaveJob>(slaveJob));
     }
-
-    public event EventHandler<EventArgs<SlaveJob, IJob>> NewChildJob;
-    private void OnNewChildJob(SlaveJob slaveJob, IJob job) {
-      var handler = NewChildJob;
-      if (handler != null) handler(this, new EventArgs<SlaveJob, IJob>(slaveJob, job));
-    }
-
-    public event EventHandler<EventArgs<SlaveJob, JobData>> WaitForChildJobs;
-    private void OnWaitForChildJobs(SlaveJob slaveJob, JobData jobData) {
-      var handler = WaitForChildJobs;
-      if (handler != null) handler(this, new EventArgs<SlaveJob, JobData>(slaveJob, jobData));
-    }
-
-    public event EventHandler<EventArgs<SlaveJob>> DeleteChildJobs;
-    private void OnDeleteChildJobs(SlaveJob slaveJob) {
-      var handler = DeleteChildJobs;
-      if (handler != null) handler(this, new EventArgs<SlaveJob>(slaveJob));
-    }
     #endregion
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Manager/PluginManager.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.
@@ -33 +33 @@
     private static object locker = new object();
     private const string lastUsedFileName = "lastUsed.dat";
-
     //maximum number of days after which a plugin gets deleted if not used
     private const int maxAge = 5;
 
+    private string PluginCacheDir { get; set; }
+    public string PluginTempBaseDir { get; set; }
     private ILog log;
     private IPluginProvider pluginService;
-    public string PluginCacheDir { get; set; }
-    public string PluginTempBaseDir { get; set; }
-
     private List<Guid> cachedPluginsGuids = new List<Guid>();
-
-    //public static PluginCache Instance {
-    //  get {        return instance;      }
-    //  set {}
-    //}
 
     public PluginManager(IPluginProvider pluginService, ILog log) {
@@ -92 +85 @@
 
         if (requestedPlugin.Name == "Configuration") {
-          configFileName = Path.Combine(targetDir, Path.GetFileName(filePaths.SingleOrDefault())); // configuration plugin consists only of 1 file (usually the "HeuristicLab X.X.exe.config")
+          // configuration plugin consists only of 1 file (usually the "HeuristicLab X.X.exe.config")
+          configFileName = Path.Combine(targetDir, Path.GetFileName(filePaths.SingleOrDefault()));
         }
       }
@@ -179 +173 @@
           configFileName = "";
         }
-        log.LogMessage("Fetched " + missingGuids.Count + " plugins for job " + job.Id);
+        log.LogMessage(string.Format("Fetched {0} plugins for job {1}", missingGuids.Count, job.Id));
       }
     }
@@ -290 +284 @@
         while (tries > 0) {
           try {
-            if(Directory.Exists(path)) Directory.Delete(path, true);
+            if (Directory.Exists(path)) Directory.Delete(path, true);
             tries = 0;
           }
-          catch (Exception e) {
+          catch (Exception) {
             Thread.Sleep(1000);
             tries--;
-            if (tries == 0) throw;// TODO: don't know what to do
+            if (tries == 0) throw;
           }
         }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/MessageQueue.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.

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/NetworkEnum.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.
@@ -20 +20 @@
 #endregion
 
-
 namespace HeuristicLab.Clients.Hive.SlaveCore {
   public class NetworkEnum {
-    public enum WcfConnState { Connected, Disconnected, Failed }  
+    public enum WcfConnState { Connected, Disconnected, Failed }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Properties/AssemblyInfo.cs.frame

@@ -11 +11 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2010 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/ServiceContracts/ISlaveCommunication.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.

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/ServiceContracts/ISlaveCommunicationCallbacks.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.
@@ -21 +21 @@
 
 using System.ServiceModel;
-using HeuristicLab.Clients.Hive.SlaveCore;
 
 namespace HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/SlaveClientCom.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.
@@ -52 +52 @@
     private void SetupClientCom() {
       DummyListener dummy = new DummyListener();
-      pipeFactory = new DuplexChannelFactory<ISlaveCommunication>(dummy, "SlaveCommunicationServiceEndpoint");
+      try {
+        pipeFactory = new DuplexChannelFactory<ISlaveCommunication>(dummy, "SlaveCommunicationServiceEndpoint");
+      }
+      catch {
+        pipeFactory = new DuplexChannelFactory<ISlaveCommunication>(dummy, new NetNamedPipeBinding(), new EndpointAddress("net.pipe://localhost/HeuristicLabSlaveCom"));
+      }
 
       ISlaveCommunication pipeProxy = pipeFactory.CreateChannel();

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/SlaveCommunicationService.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.
@@ -24 +24 @@
 using HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts;
 
-
 namespace HeuristicLab.Clients.Hive.SlaveCore {
-
   public class SlaveCommunicationService : ISlaveCommunication {
     private static List<ISlaveCommunicationCallbacks> subscribers = new List<ISlaveCommunicationCallbacks>();

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

@@ -1 @@
-
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
 using System;
 using System.IO;
@@ -5 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Hive;
 using HeuristicLab.PluginInfrastructure.Sandboxing;
 
 namespace HeuristicLab.Clients.Hive.SlaveCore {
 
+  /// <summary>
+  ///  Manages a single job and it's appdomain. 
+  /// </summary>
   public class SlaveJob : MarshalByRefObject {
     private Executor executor;
@@ -18 +40 @@
     private PluginManager pluginManager;
     private ILog log;
-
     public Guid JobId { get; private set; }
     public bool IsPrepared { get; private set; }
@@ -48 +69 @@
       }
       catch (Exception) {
-        DisposeAppDomain(); // make sure to clean up if something went wrong
+        // make sure to clean up if something went wrong
+        DisposeAppDomain();
         throw;
       }
@@ -72 +94 @@
 
     private AppDomain CreateAppDomain(Job job, String pluginDir, string configFileName) {
-      appDomain = SandboxManager.CreateAndInitPrivilegedSandbox(job.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
+      if (job.IsPrivileged) {
+        appDomain = SandboxManager.CreateAndInitPrivilegedSandbox(job.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
+      } else {
+        appDomain = SandboxManager.CreateAndInitSandbox(job.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
+      }
       appDomain.UnhandledException += new UnhandledExceptionEventHandler(AppDomain_UnhandledException);
 
@@ -90 +116 @@
     }
 
-    /// <summary>
-    /// Kill a appdomain with a specific id.
-    /// </summary>
-    /// <param name="JobId">the GUID of the job</param>    
     public void DisposeAppDomain() {
       log.LogMessage(string.Format("Shutting down Appdomain for Job {0}", JobId));
@@ -128 +150 @@
     private void AppDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) {
       DisposeAppDomain();
-      OnExceptionOccured(new Exception("Unhandled exception: " +e.ExceptionObject.ToString()));
+      OnExceptionOccured(new Exception("Unhandled exception: " + e.ExceptionObject.ToString()));
     }
 
@@ -145 +167 @@
         if (executorMonitoringRun) {
           executorMonitoringRun = false;
-          executor.executorQueue.AddMessage(ExecutorMessageType.StopExecutorMonitoringThread);
+          executor.ExecutorCommandQueue.AddMessage(ExecutorMessageType.StopExecutorMonitoringThread);
         }
       }
@@ -158 +180 @@
       while (executorMonitoringRun) {
         //this blocks through the appdomain border, that's why the lease gets renewed
-        ExecutorMessage message = executor.executorQueue.GetMessage();
+        ExecutorMessage message = executor.ExecutorCommandQueue.GetMessage();
 
         switch (message.MessageType) {
@@ -181 +203 @@
             OnJobFailed(new JobFailedException(executor.CurrentException));
             DisposeAppDomain();
-            break;
-
-          case ExecutorMessageType.NewChildJob:
-            OnNewChildJob(((JobExecutorMessage)message).Job);
-            break;
-
-          case ExecutorMessageType.WaitForChildJobs:
-            executorMonitoringRun = false;
-            OnWaitForChildJobs();
-            DisposeAppDomain();
-            break;
-
-          case ExecutorMessageType.DeleteChildJobs:
-            OnDeleteChildJobs();
             break;
 
@@ -240 +248 @@
       if (handler != null) handler(this, new EventArgs<Guid, Exception>(this.JobId, exception));
     }
-
-    public event EventHandler<EventArgs<Guid, IJob>> NewChildJob;
-    private void OnNewChildJob(IJob job) {
-      var handler = NewChildJob;
-      if (handler != null) handler(this, new EventArgs<Guid, IJob>(this.JobId, job));
-    }
-
-    public event EventHandler<EventArgs<Guid>> WaitForChildJobs;
-    private void OnWaitForChildJobs() {
-      var handler = WaitForChildJobs;
-      if (handler != null) handler(this, new EventArgs<Guid>(this.JobId));
-    }
-
-    public event EventHandler<EventArgs<Guid>> DeleteChildJobs;
-    private void OnDeleteChildJobs() {
-      var handler = DeleteChildJobs;
-      if (handler != null) handler(this, new EventArgs<Guid>(this.JobId));
-    }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/SlaveStatusInfo.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.

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/StatusCommons.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.
@@ -58 +58 @@
 
     public override string ToString() {
-      return string.Format("Status: {0}, Fetc,Start,Fin,Abor,Fail,Exc: {1},{2},{3},{4},{5},{6}", 
+      return string.Format("Status: {0}, Fetc,Start,Fin,Abor,Fail,Exc: {1},{2},{3},{4},{5},{6}",
         Status, JobsFetched, JobsStarted, JobsFinished, JobsAborted, JobsFailed, ExceptionsOccured);
     }
-
-
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/WcfService.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.
@@ -29 +29 @@
 
   /// <summary>
-  /// WcfService class is implemented as a Singleton and works as a communication Layer with the Server
+  /// WcfService class is implemented as a singleton and works as a communication layer with the Hive server
   /// </summary>
   public class WcfService : MarshalByRefObject, IPluginProvider {
     private static WcfService instance;
+    public DateTime ConnectedSince { get; private set; }
+    public NetworkEnum.WcfConnState ConnState { get; private set; }
+
     /// <summary>
     /// Getter for the Instance of the WcfService
@@ -48 +51 @@
     }
 
-    public DateTime ConnectedSince { get; private set; }
-    public NetworkEnum.WcfConnState ConnState { get; private set; }
-
     private WcfService() {
       ConnState = NetworkEnum.WcfConnState.Disconnected;
@@ -99 +99 @@
 
     /// <summary>
-    /// Uploads the JobData and sets a new jobState (while correctly setting Transferring state)
+    /// Uploads the jobData and sets a new jobState (while correctly setting Transferring state)
     /// </summary>
     public void UpdateJobData(Job job, JobData jobData, Guid slaveId, JobState state) {
@@ -122 +122 @@
 
     #region Plugin Methods
-
     public Plugin GetPlugin(Guid id) {
       return CallHiveService(s => s.GetPlugin(id));
@@ -152 +151 @@
     #region Helpers
     /// <summary>
-    /// Connects with the Server, registers the events and fires the Connected (and quiet possibly the ConnectionRestored) Event.
+    /// Connects with the server, registers the events and fires the Connected event.
     /// </summary>
     public void Connect(Slave slaveInfo) {
@@ -164 +163 @@
 
     /// <summary>
-    /// Disconnects the Slave from the Server
+    /// Disconnects the slave from the server
     /// </summary>
     public void Disconnect() {
@@ -174 +173 @@
 
     /// <summary>
-    /// Network communication Error Handler - Every network error gets logged and the connection switches to faulted state
-    /// </summary>
-    /// <param name="e">The Exception</param>
+    /// Network communication error handler.
+    /// Every network error gets logged and the connection switches to faulted state
+    /// </summary>
     private void HandleNetworkError(Exception e) {
       ConnState = NetworkEnum.WcfConnState.Failed;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.4.sln

@@ -94 +94 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave-3.4.ConsoleTests", "HeuristicLab.Clients.Hive.Slave\3.4\ConsoleTests\HeuristicLab.Clients.Hive.Slave-3.4.ConsoleTests.csproj", "{B09E8C65-8D4D-48B3-8E9A-F6FC52107261}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave-3.4.Tests", "HeuristicLab.Clients.Hive.Slave\3.4\Tests\HeuristicLab.Clients.Hive.Slave-3.4.Tests.csproj", "{C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4", "HeuristicLab.Clients.Hive.Slave.ConsoleClient\HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4.csproj", "{464D70B8-2D91-485C-B622-22E4A4891C68}"
@@ -416 +414 @@
     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261}.Release|x86.ActiveCfg = Release|x86
     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261}.Release|x86.Build.0 = Release|x86
-    {C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-    {C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA}.Debug|Mixed Platforms.Build.0 = Debug|x86
-    {C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA}.Debug|x64.ActiveCfg = Debug|x86
-    {C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA}.Debug|x86.ActiveCfg = Debug|x86
-    {C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA}.Debug|x86.Build.0 = Debug|x86
-    {C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA}.Release|Any CPU.Build.0 = Release|Any CPU
-    {C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA}.Release|Mixed Platforms.ActiveCfg = Release|x86
-    {C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA}.Release|Mixed Platforms.Build.0 = Release|x86
-    {C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA}.Release|x64.ActiveCfg = Release|x86
-    {C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA}.Release|x86.ActiveCfg = Release|x86
-    {C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA}.Release|x86.Build.0 = Release|x86
     {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -471 +455 @@
     {542AD827-817C-44E9-AD28-D6607BC4FA10} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
     {B09E8C65-8D4D-48B3-8E9A-F6FC52107261} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
-    {C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
     {464D70B8-2D91-485C-B622-22E4A4891C68} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
     {EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC} = {E69A1E5F-63F7-493F-BBA2-163D6E321D44}

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive/3.4/IJob.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 
@@ -43 +41 @@
     bool ComputeInParallel { get; set; }
 
-    /// <summary>
-    /// If this is set to true, the job should be Resumed with the child-jobs attatched instead of Started
-    /// </summary>
-    bool CollectChildJobs { get; set; }
 
     void Prepare();
@@ -55 +49 @@
 
     void Stop();
-
-    void Resume(IEnumerable<IJob> childJobs);
 
     event EventHandler ComputeInParallelChanged;
@@ -71 +63 @@
 
     event EventHandler JobStarted;
-
-    /// <summary>
-    /// When this event occurs the job wants to sleep until all his child jobs are finished
-    /// </summary>
-    event EventHandler WaitForChildJobs;
-
-    /// <summary>
-    /// This event will be fired when the job wants to have a child-job to be computed
-    /// </summary>
-    event EventHandler<EventArgs<IJob>> NewChildJob;
-
-    /// <summary>
-    /// Will be fired when job wants all child-jobs to be deleted from hive
-    /// </summary>
-    event EventHandler DeleteChildJobs;
-
-
   }
 }