Changeset 7115 for trunk/sources/HeuristicLab.Clients.Hive/3.3/TaskDownloader.cs

Timestamp:

12/03/11 01:01:47 (12 years ago)

Author:

ascheibe

Message:

#1672

• speed up download of tasks by avoiding unnecessary service calls
• display download progress correctly

File:

• trunk/sources/HeuristicLab.Clients.Hive/3.3/TaskDownloader.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Clients.Hive/3.3/TaskDownloader.cs

@@ -25 +25 @@
 using HeuristicLab.Clients.Hive.Jobs;
 using HeuristicLab.Common;
+using System.Threading;
 
 namespace HeuristicLab.Clients.Hive {
@@ -33 +34 @@
     private bool exceptionOccured = false;
     private Exception currentException;
+    private ReaderWriterLockSlim resultsLock = new ReaderWriterLockSlim();
 
     public bool IsFinished {
       get {
-        return results.Count == taskIds.Count();
+          try {        
+              resultsLock.EnterReadLock();
+              return results.Count == taskIds.Count();
+          } finally { resultsLock.ExitReadLock(); }
       }
     }
@@ -54 +59 @@
     public int FinishedCount {
       get {
-        return results.Count;
+            try {
+              resultsLock.EnterReadLock();
+              return results.Count;
+             } finally { resultsLock.ExitReadLock(); }
       }
     }
@@ -60 +68 @@
     public IDictionary<Guid, HiveTask> Results {
       get {
-        return results;
+            try {
+              resultsLock.EnterReadLock();
+              return results;
+            } finally { resultsLock.ExitReadLock(); }
       }
     }
@@ -73 +84 @@
     public void StartAsync() {
       foreach (Guid taskId in taskIds) {
-        Task task = ServiceLocator.Instance.CallHiveService(s => s.GetTask(taskId));
-
-        taskDownloader.DownloadTask(task,
+        taskDownloader.DownloadTaskDataAndTask(taskId,
           (localJob, itemJob) => {
             if (localJob != null && itemJob != null) {
@@ -85 +94 @@
               }
               hiveTask.Task = localJob;
-              this.results.Add(localJob.Id, hiveTask);
+              try {
+                resultsLock.EnterWriteLock();
+                this.results.Add(localJob.Id, hiveTask);
+              } finally { resultsLock.ExitWriteLock(); }
             }
           });