Changeset 2050 for trunk/sources

Timestamp:

06/16/09 11:15:34 (16 years ago)

Author:

gkronber

Message:

trivial refactoring of CEDMA server and server form. #644

Location:

trunk/sources/HeuristicLab.CEDMA.Server/3.3

Files:

• Server.cs (modified) (5 diffs)
• ServerForm.cs (modified) (3 diffs)

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

@@ -33 +33 @@
 namespace HeuristicLab.CEDMA.Server {
   public class Server {
+    private static readonly string rdfFile = AppDomain.CurrentDomain.BaseDirectory + "rdf_store.db3";
+    private static readonly string rdfConnectionString = "sqlite:rdf:Data Source=\"" + rdfFile + "\"";
+
     private ServiceHost host;
-    private IStore store;
+    private Store store;
+    private IDispatcher dispatcher;
+    private IExecuter executer;
 
     private string gridServiceUrl;
-
     public string GridServiceUrl {
       get { return gridServiceUrl; }
@@ -44 +48 @@
 
     private string cedmaServiceUrl;
-
     public string CedmaServiceUrl {
       get { return cedmaServiceUrl; }
@@ -50 +53 @@
     }
 
-    public Server(IStore store) {
+    private int maxActiveJobs;
+    public int MaxActiveJobs {
+      get { return maxActiveJobs; }
+      set {
+        if (value > 0 && value <= 64) {
+          maxActiveJobs = value;
+        }
+      }
+    }
+
+    public Server() {
       IPAddress[] addresses = Dns.GetHostAddresses(Dns.GetHostName());
       // windows XP returns the external ip on index 0 while windows vista returns the external ip as one of the last entries
@@ -61 +74 @@
       }
       cedmaServiceUrl = "net.tcp://" + addresses[index] + ":8002/CEDMA";
-      this.store = store;
+      store = new Store(rdfConnectionString);
+      maxActiveJobs = 10;
     }
 
@@ -83 +97 @@
       }
     }
+
+    internal string[] GetActiveJobDescriptions() {
+      if (executer != null) return executer.GetJobs();
+      else return new string[] { };
+    }
+
+    internal void Connect(string serverUrl) {
+      dispatcher = new SimpleDispatcher(store);
+      if (serverUrl.Contains("ExecutionEngine")) {
+        executer = new HiveExecuter(dispatcher, store, serverUrl);
+      } else {
+        // default is grid backend
+        executer = new GridExecuter(dispatcher, store, serverUrl);
+      }
+      executer.Start();
+    }
   }
 }

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

@@ -43 +43 @@
   public partial class ServerForm : Form {
     private Server server;
-    private Store store;
-    private IDispatcher dispatcher;
-    private IExecuter executer;
 
-    private static readonly string rdfFile = AppDomain.CurrentDomain.BaseDirectory + "rdf_store.db3";
-    private static readonly string rdfConnectionString = "sqlite:rdf:Data Source=\"" + rdfFile + "\"";
 
     public ServerForm() {
       InitializeComponent();
-      store = new Store(rdfConnectionString);
-      server = new Server(store);
+      server = new Server();
       server.Start();
       addressTextBox.Text = server.CedmaServiceUrl;
@@ -59 +53 @@
 
     private void refreshTimer_Tick(object sender, EventArgs e) {
-      listBox.DataSource = executer.GetJobs();
+      listBox.DataSource = server.GetActiveJobDescriptions();
     }
 
     private void connectButton_Click(object sender, EventArgs e) {
-      dispatcher = new SimpleDispatcher(store);
-      if (address.Text.Contains("ExecutionEngine")) {
-        executer = new HiveExecuter(dispatcher, store, address.Text);
-      } else { 
-        // default is grid backend
-        executer = new GridExecuter(dispatcher, store, address.Text);
-      }
-      executer.Start();
+      server.Connect(address.Text);
       maxActiveJobsUpDown.Enabled = true;
-      maxActiveJobsUpDown.Value = executer.MaxActiveJobs;
+      maxActiveJobsUpDown.Value = server.MaxActiveJobs;
       connectButton.Enabled = false;
       refreshTimer.Start();
@@ -78 +65 @@
 
     private void maxActiveJobsUpDown_ValueChanged(object sender, EventArgs e) {
-      executer.MaxActiveJobs = Convert.ToInt32(maxActiveJobsUpDown.Value);
+      server.MaxActiveJobs = Convert.ToInt32(maxActiveJobsUpDown.Value);
     }
   }