Changeset 398 for trunk/sources/HeuristicLab.CEDMA.Server

Timestamp:

07/29/08 16:17:10 (16 years ago)

Author:

gkronber

Message:

removed the distinction between controller agents and normal agents. Also removed the AgentScheduler because it is not needed anymore. (ticket #204)

Location:

trunk/sources/HeuristicLab.CEDMA.Server

Files:

• AgentScheduler.cs (deleted)
• HeuristicLab.CEDMA.Server.csproj (modified) (1 diff)
• RunScheduler.cs (modified) (1 diff)
• ServerForm.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.CEDMA.Server/HeuristicLab.CEDMA.Server.csproj

@@ -59 +59 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AgentScheduler.cs" />
     <Compile Include="RunScheduler.cs" />
     <Compile Include="DbPersistenceManager.cs" />

trunk/sources/HeuristicLab.CEDMA.Server/RunScheduler.cs

@@ -64 +64 @@
     }
     private void ReleaseWaitingRuns() {
-      IEnumerable<AgentEntry> agents;
+      ICollection<AgentEntry> agents;
       lock(remoteCommLock) {
-        agents = database.GetAgents(ProcessStatus.Waiting).Where(a=>!a.ControllerAgent);
+        agents = database.GetAgents(ProcessStatus.Waiting);
       }
       foreach(AgentEntry entry in agents) {

trunk/sources/HeuristicLab.CEDMA.Server/ServerForm.cs

@@ -54 +54 @@
     }
 
-    private void InitAgentScheduler() {
-      AgentScheduler scheduler = new AgentScheduler(database, addressTextBox.Text);
-      Thread agentSchedulerThread = new Thread(scheduler.Run);
-      agentSchedulerThread.Start();
-    }
-
     private void InitRunScheduler() {
       JobManager jobManager = new JobManager(gridAddress.Text);
@@ -81 +75 @@
     private void Start() {
       InitDatabase();
-      InitAgentScheduler();
       InitRunScheduler();