Changeset 6357 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs

Timestamp:

06/05/11 22:35:40 (13 years ago)

Author:

cneumuel

Message:

#1233

• refactoring of slave core
• created JobManager, which is responsible for managing jobs without knowing anything about the service. this class is easier testable than slave core
• lots of cleanup
• created console test project for slave

File:

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

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
+using HeuristicLab.Hive;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Clients.Hive.SlaveCore {
@@ -29 +31 @@
   /// WcfService class is implemented as a Singleton and works as a communication Layer with the Server
   /// </summary>
-  public class WcfService : MarshalByRefObject {
+  public class WcfService : MarshalByRefObject, IPluginProvider {
     private static WcfService instance;
     /// <summary>
@@ -62 +64 @@
     }
 
-    public Guid AddChildJob(Guid parentJobId, Job job, JobData jobData) {
-      return CallHiveService(s => s.AddChildJob(parentJobId, job, jobData));
+    public Guid AddChildJob(Guid parentJobId, Job job, IJob jobDataObject) {
+      return CallHiveService(s => {
+        JobData jobData = new JobData();
+        IEnumerable<Type> types;
+        jobData.Data = PersistenceUtil.Serialize(jobDataObject, out types);
+        var plugins = new List<IPluginDescription>();
+        PluginUtil.CollectDeclaringPlugins(plugins, types);
+        job.PluginsNeededIds = PluginUtil.GetPluginDependencies(s, new List<Plugin>(), new List<Plugin>(), plugins, false);
+        return s.AddChildJob(parentJobId, job, jobData);
+      });
     }