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

Timestamp:

07/09/08 21:37:36 (16 years ago)

Author:

gkronber

Message:

worked on #188

Location:

trunk/sources/HeuristicLab.CEDMA.Server

Files:

• AgentScheduler.cs (modified) (3 diffs)
• HeuristicLab.CEDMA.Server.csproj (modified) (2 diffs)
• RunScheduler.cs (added)
• ServerForm.cs (modified) (5 diffs)
• ServerForm.designer.cs (modified) (5 diffs)

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

@@ -59 +59 @@
         engines.Remove(e);
         AgentEntry entry = agent[e];
-        entry.Status = AgentStatus.Finished;
-        database.Update(entry);
+        entry.Status = ProcessStatus.Finished;
+        database.UpdateAgent(entry.Id, entry.Status);
       }
     }
     private void CreateNewEngines() {
-      ICollection<AgentEntry> agents = database.GetAgentEntries(AgentStatus.Waiting);
+      ICollection<AgentEntry> agents = database.GetAgents(ProcessStatus.Waiting);
       foreach(AgentEntry a in agents) {
         SequentialEngine.SequentialEngine engine = new HeuristicLab.SequentialEngine.SequentialEngine();
@@ -75 +75 @@
         agent[engine] = a;
         engines.Add(engine);
-        a.Status = AgentStatus.Active;
-        database.Update(a);
+        a.Status = ProcessStatus.Active;
+        database.UpdateAgent(a.Id, a.Status);
       }
     }
@@ -84 +84 @@
           engine.ExecuteStep();
         }
-        Thread.Sleep(100); // prevent over-load
+        Thread.Sleep(100); // prevent overload
       }
     }

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

@@ -60 +60 @@
   <ItemGroup>
     <Compile Include="AgentScheduler.cs" />
+    <Compile Include="RunScheduler.cs" />
     <Compile Include="DbPersistenceManager.cs" />
     <Compile Include="ServerApplication.cs" />
@@ -87 +88 @@
       <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
       <Name>HeuristicLab.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Grid\HeuristicLab.Grid.csproj">
+      <Project>{545CE756-98D8-423B-AC2E-6E7D70926E5C}</Project>
+      <Name>HeuristicLab.Grid</Name>
     </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">

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

@@ -36 +36 @@
 using System.Data.Common;
 using System.Threading;
+using HeuristicLab.Grid;
 
 namespace HeuristicLab.CEDMA.Server {
@@ -45 +46 @@
     public ServerForm() {
       InitializeComponent();
-      InitDatabase();
-      InitAgentScheduler();
-
       // windows XP returns the external ip on index 0 while windows vista returns the external ip on index 2
       if (System.Environment.OSVersion.Version.Major >= 6) {
@@ -54 +52 @@
         addressTextBox.Text = "net.tcp://" + Dns.GetHostAddresses(Dns.GetHostName())[0] + ":8002/CEDMA/World";
       }
-      Start();
     }
 
     private void InitAgentScheduler() {
       AgentScheduler scheduler = new AgentScheduler(database);
+      ThreadPool.QueueUserWorkItem(delegate(object status) { scheduler.Run(); });
+    }
+
+    private void InitRunScheduler() {
+      JobManager jobManager = new JobManager(gridAddress.Text);
+      RunScheduler scheduler = new RunScheduler(database, jobManager);
       ThreadPool.QueueUserWorkItem(delegate(object status) { scheduler.Run(); });
     }
@@ -74 +77 @@
 
     private void Start() {
+      InitDatabase();
+      InitAgentScheduler();
+      InitRunScheduler();
+
       host = new ServiceHost(database, new Uri(addressTextBox.Text));
       ServiceThrottlingBehavior throttlingBehavior = new ServiceThrottlingBehavior();
@@ -95 +102 @@
     private void statusUpdateTimer_Tick(object sender, EventArgs e) {
     }
+
+    private void startButton_Click(object sender, EventArgs e) {
+      Start();
+      startButton.Enabled = false;
+    }
   }
 }

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

@@ -51 +51 @@
       this.activeAgentsTextBox = new System.Windows.Forms.TextBox();
       this.statusUpdateTimer = new System.Windows.Forms.Timer(this.components);
+      this.gridAddressLabel = new System.Windows.Forms.Label();
+      this.gridAddress = new System.Windows.Forms.TextBox();
+      this.startButton = new System.Windows.Forms.Button();
       this.SuspendLayout();
       // 
@@ -73 +76 @@
       // 
       this.activeAgentsLabel.AutoSize = true;
-      this.activeAgentsLabel.Location = new System.Drawing.Point(12, 35);
+      this.activeAgentsLabel.Location = new System.Drawing.Point(12, 61);
       this.activeAgentsLabel.Name = "activeAgentsLabel";
       this.activeAgentsLabel.Size = new System.Drawing.Size(75, 13);
@@ -81 +84 @@
       // activeAgentsTextBox
       // 
-      this.activeAgentsTextBox.Location = new System.Drawing.Point(106, 32);
+      this.activeAgentsTextBox.Location = new System.Drawing.Point(106, 58);
       this.activeAgentsTextBox.Name = "activeAgentsTextBox";
       this.activeAgentsTextBox.ReadOnly = true;
@@ -95 +98 @@
       this.statusUpdateTimer.Tick += new System.EventHandler(this.statusUpdateTimer_Tick);
       // 
+      // gridAddressLabel
+      // 
+      this.gridAddressLabel.AutoSize = true;
+      this.gridAddressLabel.Location = new System.Drawing.Point(12, 35);
+      this.gridAddressLabel.Name = "gridAddressLabel";
+      this.gridAddressLabel.Size = new System.Drawing.Size(69, 13);
+      this.gridAddressLabel.TabIndex = 9;
+      this.gridAddressLabel.Text = "&Grid address:";
+      // 
+      // gridAddress
+      // 
+      this.gridAddress.Location = new System.Drawing.Point(106, 32);
+      this.gridAddress.Name = "gridAddress";
+      this.gridAddress.Size = new System.Drawing.Size(229, 20);
+      this.gridAddress.TabIndex = 8;
+      // 
+      // startButton
+      // 
+      this.startButton.Location = new System.Drawing.Point(15, 84);
+      this.startButton.Name = "startButton";
+      this.startButton.Size = new System.Drawing.Size(75, 23);
+      this.startButton.TabIndex = 10;
+      this.startButton.Text = "Start";
+      this.startButton.UseVisualStyleBackColor = true;
+      this.startButton.Click += new System.EventHandler(this.startButton_Click);
+      // 
       // ServerForm
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.ClientSize = new System.Drawing.Size(347, 62);
+      this.ClientSize = new System.Drawing.Size(347, 119);
+      this.Controls.Add(this.startButton);
+      this.Controls.Add(this.gridAddressLabel);
+      this.Controls.Add(this.gridAddress);
       this.Controls.Add(this.activeAgentsLabel);
       this.Controls.Add(this.activeAgentsTextBox);
@@ -118 +150 @@
     private System.Windows.Forms.TextBox activeAgentsTextBox;
     private System.Windows.Forms.Timer statusUpdateTimer;
+    private System.Windows.Forms.Label gridAddressLabel;
+    private System.Windows.Forms.TextBox gridAddress;
+    private System.Windows.Forms.Button startButton;
   }
 }