Changeset 2082 for trunk/sources/HeuristicLab.Hive.Client.Core/3.2

Timestamp:

06/23/09 11:35:41 (15 years ago)

Author:

svonolfe

Message:

Avoid out of memory exceptions related to job objects (#372)

File:

• trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Core.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Core.cs

@@ -297 +297 @@
         bool sandboxed = false;
         List<byte[]> files = new List<byte[]>();
-        foreach (CachedHivePluginInfo plugininfo in PluginCache.Instance.GetPlugins(e.Result.Job.PluginsNeeded))
+        foreach (CachedHivePluginInfo plugininfo in PluginCache.Instance.GetPlugins(e.Result.Job.JobInfo.PluginsNeeded))
           files.AddRange(plugininfo.PluginFiles);
-        
-        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, null, files);
+
+        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.JobInfo.Id.ToString(), sandboxed, null, files);
         appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
-        lock (engines) {                    
-          if (!jobs.ContainsKey(e.Result.Job.Id)) {
-            jobs.Add(e.Result.Job.Id, e.Result.Job);
-            appDomains.Add(e.Result.Job.Id, appDomain);
+        lock (engines) {
+          if (!jobs.ContainsKey(e.Result.Job.JobInfo.Id)) {
+            jobs.Add(e.Result.Job.JobInfo.Id, e.Result.Job.JobInfo);
+            appDomains.Add(e.Result.Job.JobInfo.Id, appDomain);
 
             Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
-            engine.JobId = e.Result.Job.Id;
+            engine.JobId = e.Result.Job.JobInfo.Id;
             engine.Queue = MessageQueue.GetInstance();            
             engine.Start(e.Result.Job.SerializedJob);
-            engines.Add(e.Result.Job.Id, engine);
+            engines.Add(e.Result.Job.JobInfo.Id, engine);
 
             ClientStatusInfo.JobsFetched++;