Changeset 2075 for trunk/sources/HeuristicLab.CEDMA.Server/3.3

Timestamp:

06/19/09 16:08:48 (15 years ago)

Author:

gkronber

Message:

Fixed a bug which prevented that more than 10 jobs are dispatched concurrently. #642

Location:

trunk/sources/HeuristicLab.CEDMA.Server/3.3

Files:

• Server.cs (modified) (2 diffs)
• ServerForm.cs (modified) (1 diff)
• ServerForm.designer.cs (modified) (5 diffs)

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

@@ -59 +59 @@
       get { return maxActiveJobs; }
       set {
-        if (value > 0 && value <= 64) {
+        if (value > 0) {
           maxActiveJobs = value;
+          if (executer != null) {
+            executer.MaxActiveJobs = value;
+          }
         }
       }
@@ -115 +118 @@
       }
       executer = new GridExecuter(dispatcher, store, gridServer);
+      executer.MaxActiveJobs = MaxActiveJobs;
       executer.Start();
     }

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

@@ -59 +59 @@
       server.Connect(address.Text);
       maxActiveJobsUpDown.Enabled = true;
+      activeJobsLabel.Enabled = true;
       maxActiveJobsUpDown.Value = server.MaxActiveJobs;
       connectButton.Enabled = false;

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

@@ -54 +54 @@
       this.refreshTimer = new System.Windows.Forms.Timer(this.components);
       this.maxActiveJobsUpDown = new System.Windows.Forms.NumericUpDown();
-      this.label1 = new System.Windows.Forms.Label();
+      this.activeJobsLabel = new System.Windows.Forms.Label();
       ((System.ComponentModel.ISupportInitialize)(this.maxActiveJobsUpDown)).BeginInit();
       this.SuspendLayout();
@@ -84 +84 @@
       this.gridAddressLabel.Text = "&Grid address:";
       // 
-      // gridAddress
+      // address
       // 
       this.address.Location = new System.Drawing.Point(106, 32);
-      this.address.Name = "gridAddress";
+      this.address.Name = "address";
       this.address.Size = new System.Drawing.Size(160, 20);
       this.address.TabIndex = 8;
@@ -131 +131 @@
       this.maxActiveJobsUpDown.ValueChanged += new System.EventHandler(this.maxActiveJobsUpDown_ValueChanged);
       // 
-      // label1
+      // activeJobsLabel
       // 
-      this.label1.AutoSize = true;
-      this.label1.Enabled = false;
-      this.label1.Location = new System.Drawing.Point(12, 61);
-      this.label1.Name = "label1";
-      this.label1.Size = new System.Drawing.Size(84, 13);
-      this.label1.TabIndex = 13;
-      this.label1.Text = "&Max active jobs:";
+      this.activeJobsLabel.AutoSize = true;
+      this.activeJobsLabel.Enabled = false;
+      this.activeJobsLabel.Location = new System.Drawing.Point(12, 61);
+      this.activeJobsLabel.Name = "activeJobsLabel";
+      this.activeJobsLabel.Size = new System.Drawing.Size(84, 13);
+      this.activeJobsLabel.TabIndex = 13;
+      this.activeJobsLabel.Text = "&Max active jobs:";
       // 
       // ServerForm
@@ -146 +146 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.ClientSize = new System.Drawing.Size(374, 342);
-      this.Controls.Add(this.label1);
+      this.Controls.Add(this.activeJobsLabel);
       this.Controls.Add(this.maxActiveJobsUpDown);
       this.Controls.Add(this.listBox);
@@ -172 +172 @@
     private System.Windows.Forms.Timer refreshTimer;
     private System.Windows.Forms.NumericUpDown maxActiveJobsUpDown;
-    private System.Windows.Forms.Label label1;
+    private System.Windows.Forms.Label activeJobsLabel;
   }
 }