Changeset 1166 for trunk/sources/HeuristicLab.Hive.Server.Core

Timestamp:

01/22/09 00:30:46 (16 years ago)

Author:

svonolfe

Message:

Improved memory consumption, fixed bug that already calculated jobs where reset (#372)

Location:

trunk/sources/HeuristicLab.Hive.Server.Core

Files:

• ClientCommunicator.cs (modified) (3 diffs)
• InternalInterfaces/DataAccess/IJobAdapter.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Server.Core/ClientCommunicator.cs

@@ -88 +88 @@
             client.State = State.offline;
             clientAdapter.Update(client);
-            foreach (Job job in jobAdapter.GetJobsOf(client)) {
+            foreach (Job job in jobAdapter.GetActiveJobsOf(client)) {
               jobManager.ResetJobsDependingOnResults(job);
             }
@@ -100 +100 @@
               if (client.State == State.calculating) {
                 // check wich job the client was calculating and reset it
-                foreach (Job job in jobAdapter.GetJobsOf(client)) {
+                foreach (Job job in jobAdapter.GetActiveJobsOf(client)) {
                   jobManager.ResetJobsDependingOnResults(job);
                 }
@@ -195 +195 @@
 
       if (hbData.jobProgress != null) {
-        List<Job> jobsOfClient = new List<Job>(jobAdapter.GetJobsOf(clientAdapter.GetById(hbData.ClientId)));
+        List<Job> jobsOfClient = new List<Job>(jobAdapter.GetActiveJobsOf(clientAdapter.GetById(hbData.ClientId)));
         if (jobsOfClient == null || jobsOfClient.Count == 0) {
           response.Success = false;

trunk/sources/HeuristicLab.Hive.Server.Core/InternalInterfaces/DataAccess/IJobAdapter.cs

@@ -48 +48 @@
 
     /// <summary>
+    /// Gets all active jobs of the client
+    /// </summary>
+    /// <param name="client"></param>
+    /// <returns></returns>
+    ICollection<Job> GetActiveJobsOf(ClientInfo client);
+
+    /// <summary>
     /// Gets all jobs of the user
     /// </summary>