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

Timestamp:

07/22/08 23:29:18 (16 years ago)

Author:

gkronber

Message:

worked on very basic control to view the tree of agents/runs (ticket #188)

Location:

trunk/sources/HeuristicLab.CEDMA.Server

Files:

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

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

@@ -29 +29 @@
 using System.Threading;
 using HeuristicLab.CEDMA.Core;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.CEDMA.Server {
@@ -35 +36 @@
     private List<IEngine> engines;
     private Dictionary<IEngine, AgentEntry> agent;
+    private string serverUri;
 
-    public AgentScheduler(Database database) {
+    public AgentScheduler(Database database, string serverUri) {
       this.database = database;
+      this.serverUri = serverUri;
       engines = new List<IEngine>();
       agent = new Dictionary<IEngine, AgentEntry>();
@@ -74 +77 @@
         engine.Reset();
 
+        // initialize CEDMA variables for the execution of the agent
+        engine.GlobalScope.AddVariable(new Variable("AgentId", new IntData((int)a.Id)));
+        engine.GlobalScope.AddVariable(new Variable("CedmaServerUri", new StringData(serverUri)));
+
         agent[engine] = a;
         engines.Add(engine);

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

@@ -89 +89 @@
       <Name>HeuristicLab.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Data\HeuristicLab.Data.csproj">
+      <Project>{F473D9AF-3F09-4296-9F28-3C65118DAFFA}</Project>
+      <Name>HeuristicLab.Data</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Grid\HeuristicLab.Grid.csproj">
       <Project>{545CE756-98D8-423B-AC2E-6E7D70926E5C}</Project>

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

@@ -31 +31 @@
 using HeuristicLab.Grid;
 using System.Diagnostics;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.CEDMA.Server {
@@ -39 +40 @@
       public AtomicOperation Operation;
     }
+    private string serverUri;
     private Database database;
     private JobManager jobManager;
@@ -47 +49 @@
     private AutoResetEvent runningJobs = new AutoResetEvent(false);
 
-    public RunScheduler(Database database, JobManager jobManager) {
+    public RunScheduler(Database database, JobManager jobManager, string serverUri) {
       this.database = database;
       this.jobManager = jobManager;
+      this.serverUri = serverUri;
       jobQueue = new Queue<Job>();
       Thread resultsGatheringThread = new Thread(GatherResults);
@@ -66 +69 @@
       }
       foreach(AgentEntry entry in agents) {
-        IOperatorGraph opGraph = (IOperatorGraph)DbPersistenceManager.Restore(entry.RawData);
-        AtomicOperation op = new AtomicOperation(opGraph.InitialOperator, new Scope());
+        Agent agent = (Agent)DbPersistenceManager.Restore(entry.RawData);
+        IOperatorGraph opGraph = agent.OperatorGraph;
+        Scope scope = new Scope();
+        // initialize CEDMA variables for the execution of the agent
+        scope.AddVariable(new Variable("AgentId", new IntData((int)entry.Id)));
+        scope.AddVariable(new Variable("CedmaServerUri", new StringData(serverUri)));
+        AtomicOperation op = new AtomicOperation(opGraph.InitialOperator, scope);
         WaitHandle wHandle;
         lock(remoteCommLock) {

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

@@ -55 +55 @@
 
     private void InitAgentScheduler() {
-      AgentScheduler scheduler = new AgentScheduler(database);
+      AgentScheduler scheduler = new AgentScheduler(database, addressTextBox.Text);
       Thread agentSchedulerThread = new Thread(scheduler.Run);
       agentSchedulerThread.Start();
@@ -63 +63 @@
       JobManager jobManager = new JobManager(gridAddress.Text);
       jobManager.Reset();
-      RunScheduler scheduler = new RunScheduler(database, jobManager);
+      RunScheduler scheduler = new RunScheduler(database, jobManager, addressTextBox.Text);
       Thread runSchedulerThread = new Thread(scheduler.Run);
       runSchedulerThread.Start();