Changeset 504 for trunk

Timestamp:

08/12/08 15:38:27 (16 years ago)

Author:

gkronber

Message:

reenabled waiting/running/finished counters (#197 Use SQLite backend to store waiting engines and results instead of in-memory dictionaries)

Location:

trunk/sources/HeuristicLab.Grid

Files:

• Database.cs (modified) (1 diff)
• EngineStore.cs (modified) (4 diffs)
• GridServer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Grid/Database.cs

@@ -274 +274 @@
     }
 
+    internal long GetJobCount(JobState status) {
+      rwLock.EnterReadLock();
+      try {
+        using(SQLiteConnection cnn = new SQLiteConnection(connectionString)) {
+          cnn.Open();
+          DbCommand c = cnn.CreateCommand();
+          c.CommandText = "Select Count(id) from Job where Status=@Status";
+          DbParameter stateParameter = c.CreateParameter();
+          stateParameter.ParameterName = "@Status";
+          stateParameter.Value = status.ToString();
+          c.Parameters.Add(stateParameter);
+          return (long)c.ExecuteScalar();
+        }
+      } finally {
+        rwLock.ExitReadLock();
+      }
+    }
+
     /// <summary>
     /// Does nothing right now (= running jobs that disappear are never restarted).

trunk/sources/HeuristicLab.Grid/EngineStore.cs

@@ -64 +64 @@
         database = new Database(connectionString);
       }
+
+      // init counters
+      waitingJobs = (int)database.GetJobCount(JobState.Waiting);
+      runningJobs = (int)database.GetJobCount(JobState.Busy);
+      results = (int)database.GetJobCount(JobState.Finished);
     }
 
@@ -74 +79 @@
         guid = nextWaitingJob.Guid;
         engine = nextWaitingJob.RawData;
+        runningJobs++;
+        waitingJobs--;
         return true;
       }
@@ -82 +89 @@
       // add the new result
       database.SetJobResult(guid, result);
+      results++;
     }
 
     internal void AddEngine(Guid guid, byte[] engine) {
-      database.InsertJob(guid, HeuristicLab.Grid.JobState.Waiting, engine);
+      database.InsertJob(guid, JobState.Waiting, engine);
+      waitingJobs++;
     }
 
     internal byte[] GetResult(Guid guid) {
-      if(JobState(guid) == HeuristicLab.Grid.JobState.Finished) {
+      if(GetJobState(guid) == JobState.Finished) {
         JobEntry entry = database.GetJob(guid);
         return entry.RawData;
@@ -100 +109 @@
     }
 
-    internal JobState JobState(Guid guid) {
+    internal JobState GetJobState(Guid guid) {
       return database.GetJobState(guid);
     }

trunk/sources/HeuristicLab.Grid/GridServer.cs

@@ -36 +36 @@
 
     public JobState JobState(Guid guid) {
-      return engineStore.JobState(guid);
+      return engineStore.GetJobState(guid);
     }