Changeset 4141 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/Core.cs

Timestamp:

08/04/10 10:44:14 (14 years ago)

Author:

cneumuel

Message:

merged with changes from Hive-3.2

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/Core.cs (modified) (6 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/Core.cs

@@ -46 +46 @@
 using HeuristicLab.Tracing;
 using HeuristicLab.Core;
+using System.IO;
 
 namespace HeuristicLab.Hive.Client.Core {
@@ -134 +135 @@
 
         case MessageContainer.MessageType.JobAborted:
-          //todo: thread this          
-          lock (engines) {
-            Guid jobId = new Guid(container.JobId.ToString());
-            if (engines.ContainsKey(jobId)) {
-              appDomains[jobId].UnhandledException -= new UnhandledExceptionEventHandler(appDomain_UnhandledException);
-              AppDomain.Unload(appDomains[jobId]);
-              appDomains.Remove(jobId);
-              engines.Remove(jobId);
-              jobs.Remove(jobId);
-              GC.Collect();
-            } else
-              Logger.Error("JobAbort: Engine doesn't exist");
-          }
+          Guid jobId = new Guid(container.JobId.ToString());
+          KillAppDomain(jobId);
           break;
 
@@ -247 +237 @@
         if (WcfService.Instance.ConnState == NetworkEnum.WcfConnState.Loggedin) {
           Logger.Info("Sending the finished job with id: " + jId);
-          wcfService.StoreFinishedJobResultAsync(ConfigManager.Instance.GetClientInfo().Id, jId, sJob, 1.0, null, true);
+          wcfService.StoreFinishedJobResultAsync(ConfigManager.Instance.GetClientInfo().Id, jId, sJob, 1.0, engines[jId].CurrentException, true);
         } else {
           Logger.Info("Storing the finished job with id: " + jId + " to hdd");
           JobStorageManager.PersistObjectToDisc(wcfService.ServerIP, wcfService.ServerPort, jId, sJob);
-          lock (engines) {
-            appDomains[jId].UnhandledException -= new UnhandledExceptionEventHandler(appDomain_UnhandledException);
-
-            //Disposing it
-            engines[jId].Dispose();
-
-            AppDomain.Unload(appDomains[jId]);
-            Logger.Debug("Unloaded appdomain");
-            appDomains.Remove(jId);
-            engines.Remove(jId);
-            jobs.Remove(jId);
-            Logger.Debug("Removed job from appDomains, Engines and Jobs");
-          }
+          KillAppDomain(jId);
         }
       } catch (InvalidStateException ise) {
@@ -332 +310 @@
         PluginCache.Instance.PreparePlugins(e.Result.Job.PluginsNeeded);
 
+        PluginCache.Instance.CopyPluginsForJob(e.Result.Job.PluginsNeeded, e.Result.Job.Id);
+
         //        foreach (CachedHivePluginInfoDto plugininfo in PluginCache.Instance.GetPlugins(e.Result.Job.PluginsNeeded))
         //        files.AddRange(plugininfo.PluginFiles);
         Logger.Debug("Plugins fetched for job " + e.Result.Job.Id);
         try {
-          AppDomain appDomain =
-            HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(
-              e.Result.Job.Id.ToString(), null);
+          String pluginDir = Path.Combine(PluginCache.PLUGIN_REPO, e.Result.Job.Id.ToString());
+          
+          AppDomain appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(pluginDir, null);
           appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
           lock (engines) {
@@ -365 +345 @@
           CurrentlyFetching = false;
           KillAppDomain(e.Result.Job.Id);
+          wcfService.StoreFinishedJobResultsSync(ConfigManager.Instance.GetClientInfo().Id, e.Result.Job.Id, new byte[] { }, 1, exception, true);
         }
       } else
@@ -497 +478 @@
           engines.Remove(id);
           jobs.Remove(id);
+          PluginCache.Instance.DeletePluginsForJob(id);
           GC.Collect();
         } catch (Exception ex) {