Changeset 1589

Timestamp:

04/17/09 12:20:19 (15 years ago)

Author:

kgrading

Message:

refactoring (#547)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Communication/3.2/WcfService.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/3.2/Core.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/3.2/PluginCache.cs (modified) (2 diffs)
• HeuristicLab.Hive.Contracts/3.2/BusinessObjects/CachedPlugin.cs (added)
• HeuristicLab.Hive.Contracts/3.2/HeuristicLab.Hive.Contracts-3.2.csproj (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.2/ResponsePlugin.cs (modified) (1 diff)
• HeuristicLab.Hive.Engine/3.2/HeuristicLab.Hive.Engine-3.2.csproj (modified) (1 diff)
• HeuristicLab.Hive.Engine/3.2/HiveEngine.cs (modified) (1 diff)
• HeuristicLab.Hive.JobBase/3.2/TestJob.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/CachedPlugin.cs (deleted)
• HeuristicLab.PluginInfrastructure/HeuristicLab.PluginInfrastructure.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/WcfService.cs

@@ -253 +253 @@
     }
 
-    public List<CachedPlugin> RequestPlugins(List<PluginInfo> requestedPlugins) {
+    public List<CachedHivePluginInfo> RequestPlugins(List<PluginInfo> requestedPlugins) {
       try {
         return proxy.SendPlugins(requestedPlugins.ToArray()).Plugins;

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

@@ -229 +229 @@
 
     void wcfService_StoreFinishedJobResultCompleted(object sender, StoreFinishedJobResultCompletedEventArgs e) {
-      if (e.Result.Success) {        
-        lock(engines) {        
-          //if the engine is running again -> we sent an snapshot. Otherwise the job was finished
-          //this method has a risk concerning race conditions.
-          //better expand the sendjobresultcompltedeventargs with a boolean "snapshot?" flag
+      lock(engines) {
+        try {
           AppDomain.Unload(appDomains[e.Result.JobId]);
           appDomains.Remove(e.Result.JobId);
           engines.Remove(e.Result.JobId);
           jobs.Remove(e.Result.JobId);
-          ClientStatusInfo.JobsProcessed++;
-          Debug.WriteLine("ProcessedJobs to:" + ClientStatusInfo.JobsProcessed);
-        }        
+        }
+        catch (Exception ex) {
+          Logging.Instance.Error(this.ToString(), "Exception when unloading the appdomain: ", ex);
+        }
+      }
+      if (e.Result.Success) {        
+      
+        //if the engine is running again -> we sent an snapshot. Otherwise the job was finished
+        //this method has a risk concerning race conditions.
+        //better expand the sendjobresultcompltedeventargs with a boolean "snapshot?" flag
+
+        ClientStatusInfo.JobsProcessed++;
+        Debug.WriteLine("ProcessedJobs to:" + ClientStatusInfo.JobsProcessed);                
       } else {        
-        Logging.Instance.Error(this.ToString(), "Sending of job " + e.Result.JobId + " failed");
+        Logging.Instance.Error(this.ToString(), "Sending of job " + e.Result.JobId + " failed, job has been wasted. Message: " + e.Result.StatusMessage);
       }
     }
 
     void wcfService_ProcessSnapshotCompleted(object sender, ProcessSnapshotCompletedEventArgs e) {
-      Logging.Instance.Info(this.ToString(), "Snapshot " + e.Result.JobId + " has been transmitted according to plan");
+      Logging.Instance.Info(this.ToString(), "Snapshot " + e.Result.JobId + " has been transmitted according to plan.");
     }
 

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

@@ -9 +9 @@
 namespace HeuristicLab.Hive.Client.Core {
   public class PluginCache {
-    private List<CachedPlugin> pluginCache;
+    private List<CachedHivePluginInfo> pluginCache;
     
     public PluginCache() {
-      pluginCache = new List<CachedPlugin>();
+      pluginCache = new List<CachedHivePluginInfo>();
     }
     
-    public void AddPlugin(CachedPlugin plugin) {
+    public void AddPlugin(CachedHivePluginInfo plugin) {
       pluginCache.Add(plugin);    
     }
 
-    public List<CachedPlugin> GetPlugins(List<PluginInfo> requests) {
-      List<CachedPlugin> neededPlugins = new List<CachedPlugin>();
+    public List<CachedHivePluginInfo> GetPlugins(List<PluginInfo> requests) {
+      List<CachedHivePluginInfo> neededPlugins = new List<CachedHivePluginInfo>();
       List<PluginInfo> missingPlugins = new List<PluginInfo>();
       bool found = false;
       foreach (PluginInfo info in requests) {
-        foreach (CachedPlugin cache in pluginCache) {
+        foreach (CachedHivePluginInfo cache in pluginCache) {
           if (info.Equals(cache)) {
             neededPlugins.Add(cache);
@@ -36 +36 @@
       }
 
-      List<CachedPlugin> receivedPlugins = WcfService.Instance.RequestPlugins(missingPlugins);
+      List<CachedHivePluginInfo> receivedPlugins = WcfService.Instance.RequestPlugins(missingPlugins);
       if (receivedPlugins != null) {
         neededPlugins.AddRange(receivedPlugins);

trunk/sources/HeuristicLab.Hive.Contracts/3.2/HeuristicLab.Hive.Contracts-3.2.csproj

@@ -87 +87 @@
   <ItemGroup>
     <Compile Include="ApplicationConstants.cs" />
+    <Compile Include="BusinessObjects\CachedPlugin.cs" />
     <Compile Include="BusinessObjects\ClientGroup.cs" />
     <Compile Include="BusinessObjects\HivePluginInfo.cs" />

trunk/sources/HeuristicLab.Hive.Contracts/3.2/ResponsePlugin.cs

@@ -11 +11 @@
   public class ResponsePlugin : Response {
     [DataMember]
-    public List<CachedPlugin> Plugins { get; set; }
+    public List<CachedHivePluginInfo> Plugins { get; set; }
   }
 }

trunk/sources/HeuristicLab.Hive.Engine/3.2/HeuristicLab.Hive.Engine-3.2.csproj

@@ -4 +4 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}</ProjectGuid>

trunk/sources/HeuristicLab.Hive.Engine/3.2/HiveEngine.cs

@@ -93 +93 @@
         pluginInfo.BuildDate = info.BuildDate.ToString();
 
+
+
         pluginsNeeded.Add(pluginInfo);
       }

trunk/sources/HeuristicLab.Hive.JobBase/3.2/TestJob.cs

@@ -37 +37 @@
 
     public override void Run() {
-      int max = 10;
+      int max = 100;
       while(runValue < max && abort == false) {
         //for (int y = 0; y < Int32.MaxValue; y++) ;

trunk/sources/HeuristicLab.PluginInfrastructure/HeuristicLab.PluginInfrastructure.csproj

@@ -86 +86 @@
     <Compile Include="BaseClasses\ApplicationBase.cs" />
     <Compile Include="BaseClasses\PluginBase.cs" />
-    <Compile Include="CachedPlugin.cs" />
     <Compile Include="ClassInfoAttribute.cs" />
     <Compile Include="Interfaces\IApplication.cs" />