Changeset 4107 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Engine

Timestamp:

07/26/10 18:17:16 (14 years ago)

Author:

cneumuel

Message:

migration from 3.2 to 3.3 completed. Hive Server and Client are now executable and as functional as they were in 3.2. (#1096)

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Engine/3.3

Files:

• HeuristicLab.Hive.Engine-3.3.csproj (modified) (1 diff)
• HiveEngine.cs (modified) (7 diffs)
• Job.cs (modified) (4 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Engine/3.3/HeuristicLab.Hive.Engine-3.3.csproj

@@ -100 +100 @@
       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Engine/3.3/HiveEngine.cs

@@ -28 +28 @@
 using System.Xml;
 using System.IO.Compression;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Hive.JobBase;
@@ -35 +36 @@
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Tracing;
+using HeuristicLab.Persistence.Default.Xml;
+using System.Reflection;
 
 namespace HeuristicLab.Hive.Engine {
@@ -49 +52 @@
     private object locker = new object();
     private volatile bool abortRequested;
+    private ThreadPriority priority;
 
     public string HiveServerUrl { get; set; }
@@ -55 +59 @@
 
     public HiveEngine() {
+      // <debug>
+      HiveServerUrl = "net.tcp://10.42.1.153:9000/ExecutionEngine/ExecutionEngineFacade";
+      RessourceIds = "MyGroup";
+      // </debug>
+
       job = new Job();
       abortRequested = false;
@@ -73 +82 @@
 
     public ThreadPriority Priority {
-      get { return this.Priority; }
-      set { this.Priority = value; }
+      get { return this.priority; }
+      set { this.priority = value; }
     }
 
@@ -148 +157 @@
             if (response.Success && response.Obj != null && response.StatusMessage != ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE) {
               Logger.Debug("HiveEngine: Results-polling - Got result!");
-              throw new NotImplementedException("TODO[chn]use persistency-3.3");
-              //restoredJob = (Job)PersistenceManager.RestoreFromGZip(response.Obj.SerializedJobData);
+              restoredJob = XmlParser.Deserialize<Job>(new MemoryStream(response.Obj.SerializedJobData));
               Logger.Debug("HiveEngine: Results-polling - IsSnapshotResult: " + (restoredJob.Progress < 1.0));
             }
@@ -167 +175 @@
 
     private HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob CreateJobObj() {
-      HeuristicLab.Hive.Contracts.BusinessObjects.JobDto jobObj =
-        new HeuristicLab.Hive.Contracts.BusinessObjects.JobDto();
-
-
-      throw new NotImplementedException("TODO[chn]use persistency-3.3");
-
-      //MemoryStream memStream = new MemoryStream();
-      //GZipStream stream = new GZipStream(memStream, CompressionMode.Compress, true);
-      //XmlDocument document = PersistenceManager.CreateXmlDocument();
-      //Dictionary<Guid, IStorable> dictionary = new Dictionary<Guid, IStorable>();
-      //XmlNode rootNode = document.CreateElement("Root");
-      //document.AppendChild(rootNode);
-      //rootNode.AppendChild(PersistenceManager.Persist(job, document, dictionary));
-      //document.Save(stream);
-      //stream.Close();
-
-      //HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob executableJobObj =
-      //  new HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob();
-      //executableJobObj.JobInfo = jobObj;
-      //executableJobObj.SerializedJobData = memStream.ToArray();
-
-      //List<IPluginDescription> plugins = new List<IPluginDescription>();
-
-      //foreach (IStorable storeable in dictionary.Values) {
-      //  IPluginDescription pluginInfo = ApplicationManager.Manager.GetDeclaringPlugin(storeable.GetType());
-      //  if (!plugins.Contains(pluginInfo)) {
-      //    plugins.Add(pluginInfo);
-      //    foreach (var dependency in pluginInfo.Dependencies) {
-      //      if (!plugins.Contains(dependency)) plugins.Add(dependency);
-      //    }
-      //  }
-      //}
-
-      //List<HivePluginInfoDto> pluginsNeeded =
-      //  new List<HivePluginInfoDto>();
-      //foreach (IPluginDescription uniquePlugin in plugins) {
-      //  HivePluginInfoDto pluginInfo =
-      //    new HivePluginInfoDto();
-      //  pluginInfo.Name = uniquePlugin.Name;
-      //  pluginInfo.Version = uniquePlugin.Version;
-      //  pluginInfo.BuildDate = uniquePlugin.BuildDate;
-      //  pluginsNeeded.Add(pluginInfo);
-      //}
-
-      //jobObj.CoresNeeded = 1;
-      //jobObj.PluginsNeeded = pluginsNeeded;
-      //jobObj.State = HeuristicLab.Hive.Contracts.BusinessObjects.State.offline;
-      //return executableJobObj;
+      HeuristicLab.Hive.Contracts.BusinessObjects.JobDto jobObj = new HeuristicLab.Hive.Contracts.BusinessObjects.JobDto();
+
+      // create xml document with <Root> as root-node and the persisted job as child
+      MemoryStream memStream = new MemoryStream();
+      XmlGenerator.Serialize(job, memStream);
+
+      // convert memStream to byte-array
+      HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob executableJobObj = new HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob();
+      executableJobObj.JobInfo = jobObj;
+      executableJobObj.SerializedJobData = memStream.ToArray();
+
+      // find out which which plugins are needed to recreate the type
+      List<HivePluginInfoDto> pluginsNeeded = (
+        from p in GetDeclaringPlugins(job.GetType())
+        select new HivePluginInfoDto() {
+          Name = p.Name,
+          Version = p.Version,
+          BuildDate = p.BuildDate,
+        }).ToList();
+
+      jobObj.CoresNeeded = 1;
+      jobObj.PluginsNeeded = pluginsNeeded;
+      jobObj.State = HeuristicLab.Hive.Contracts.BusinessObjects.State.offline;
+      return executableJobObj;
+    }
+
+    /// <summary>
+    /// Returns a list of plugins in which the type itself and all members 
+    /// of the type are declared. Objectgraph is searched recursively.
+    /// </summary>
+    private IEnumerable<IPluginDescription> GetDeclaringPlugins(Type type) {
+      HashSet<Type> types = new HashSet<Type>();
+      FindTypes(type, types, "HeuristicLab.");
+      IEnumerable<IPluginDescription> plugins = from t in types
+                                                select ApplicationManager.Manager.GetDeclaringPlugin(t);
+      return plugins;
+    }
+
+    /// <summary>
+    /// Recursively finds all types used in type which are in a namespace which starts with namespaceStart
+    /// </summary>
+    /// <param name="type">the type to be searched</param>
+    /// <param name="types">found types will be stored there, needed in order to avoid duplicates</param>
+    /// <param name="namespaceStart">only types from namespaces which start with this will be searched and added</param>
+    private void FindTypes(Type type, HashSet<Type> types, string namespaceStart) {
+
+      // search is not performed on attributes
+
+      if (!types.Contains(type) && type.Namespace.StartsWith(namespaceStart)) {
+        types.Add(type);
+
+        // interfaces
+        foreach (Type t in type.GetInterfaces()) {
+          FindTypes(t, types, namespaceStart);
+        }
+
+        // events
+        foreach (EventInfo info in type.GetEvents()) {
+          FindTypes(info.EventHandlerType, types, namespaceStart);
+          FindTypes(info.DeclaringType, types, namespaceStart);
+        }
+
+        // properties
+        foreach (PropertyInfo info in type.GetProperties()) {
+          FindTypes(info.PropertyType, types, namespaceStart);
+        }
+
+        // fields
+        foreach (FieldInfo info in type.GetFields()) {
+          FindTypes(info.FieldType, types, namespaceStart);
+        }
+
+        // constructors : maybe constructors them out (?)
+        foreach (ConstructorInfo info in type.GetConstructors()) {
+          foreach (ParameterInfo paramInfo in info.GetParameters()) {
+            FindTypes(paramInfo.ParameterType, types, namespaceStart);
+          }
+        }
+
+        // methods
+        foreach (MethodInfo info in type.GetMethods()) {
+          foreach (ParameterInfo paramInfo in info.GetParameters()) {
+            FindTypes(paramInfo.ParameterType, types, namespaceStart);
+          }
+          FindTypes(info.ReturnType, types, namespaceStart);
+        }
+      }
     }
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Engine/3.3/Job.cs

@@ -29 +29 @@
 using HeuristicLab.Data;
 using HeuristicLab.Common;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Hive.Engine {
@@ -34 +35 @@
   /// Represents a job that wraps an engine that should be executed in the hive.
   /// </summary>
+  [StorableClass]
   public class Job : IJob {
+    [Storable]
     private IEngine engine;
     public IEngine Engine {
@@ -79 +82 @@
     public event EventHandler JobFailed;
 
+    [Storable]
     public long JobId {
       get;
@@ -84 +88 @@
     }
 
+    [Storable]
     private double progress;
     public double Progress {