Changeset 9444 for branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3

Timestamp:

05/06/13 12:30:18 (11 years ago)

Author:

pfleck

Message:

#2030
Switched Text encoding to Mtom encoding for better performance for binary data.
Merged trunk into branch.

Location:

branches/HivePerformance/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive/3.3/app.config (modified) (1 diff)

branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -113 +113 @@
 
         foreach (var j in jobsLoaded) {
-          jobs.Add(new RefreshableJob(j) { IsAllowedPrivileged = this.isAllowedPrivileged });
+          jobs.Add(new RefreshableJob(j));
         }
       }
@@ -452 +452 @@
         IDictionary<Guid, HiveTask> allHiveTasks = downloader.Results;
         var parents = allHiveTasks.Values.Where(x => !x.Task.ParentTaskId.HasValue);
+        refreshableJob.Job.IsPrivileged = allHiveTasks.Any(x => x.Value.Task.IsPrivileged);
 
         refreshableJob.Progress.Status = "Downloading/deserializing complete. Displaying tasks...";

branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

@@ -110 +110 @@
             }
           } else {
-            StopResultPolling();
+            PauseResultPolling();
           }
         }
@@ -157 +157 @@
     }
 
-    // may execute jobs with privileged permissions on slaves
-    public bool IsAllowedPrivileged {
-      get { return Job.IsPrivileged; }
-      set {
-        if (value != Job.IsPrivileged) {
-          Job.IsPrivileged = value;
-          OnIsAllowedPrivilegedChanged();
-        }
-      }
-    }
-
     private Progress progress;
     public Progress Progress {
@@ -196 +185 @@
       this.HiveTasks = new ItemCollection<HiveTask>();
     }
-    public RefreshableJob(Job hiveExperiment) {
+    public RefreshableJob(Job hiveJob) {
       this.refreshAutomatically = true;
-      this.Job = hiveExperiment;
+      this.Job = hiveJob;
       this.log = new ThreadSafeLog();
       this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(Settings.Default.MaxParallelDownloads, Settings.Default.MaxParallelDownloads);
@@ -239 +228 @@
     public void StopResultPolling() {
       if (jobResultPoller != null && jobResultPoller.IsPolling) {
+        refreshAutomatically = false;
         jobResultPoller.Stop();
         DeregisterResultPollingEvents();
+        jobResultPoller = null;
+      }
+    }
+
+    public void PauseResultPolling() {
+      if (jobResultPoller != null && jobResultPoller.IsPolling) {
+        jobResultPoller.Stop();
       }
     }
@@ -425 +422 @@
     }
 
-    public event EventHandler IsAllowedPrivilegedChanged;
-    private void OnIsAllowedPrivilegedChanged() {
-      var handler = IsAllowedPrivilegedChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
     public event EventHandler JobStatisticsChanged;
     private void OnJobStatisticsChanged() {
@@ -515 +506 @@
     public event EventHandler HiveTasksChanged;
     protected virtual void OnHiveTasksChanged() {
-      StopResultPolling();
       if (this.HiveTasks != null && this.HiveTasks.Count > 0 && this.GetAllHiveTasks().All(x => x.Task.Id != Guid.Empty)) {
         if (IsFinished()) {
           this.ExecutionState = Core.ExecutionState.Stopped;
           this.RefreshAutomatically = false;
-          if (jobResultPoller != null) DeregisterResultPollingEvents();
+          StopResultPolling();
         } else {
           this.RefreshAutomatically = true;

branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/app.config

@@ -48 +48 @@
                  maxBufferPoolSize="2147483647"
                  maxReceivedMessageSize="2147483647"
-                 messageEncoding="Text"
+                 messageEncoding="Mtom"
                  textEncoding="utf-8"
                  useDefaultWebProxy="true"