Changeset 2108


Ignore:
Timestamp:
06/25/09 17:02:24 (12 years ago)
Author:
kgrading
Message:

various updates (#467)

Location:
trunk/sources
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Hive.Client.Core/3.2/ConfigurationManager/ConfigManager.cs

    r2107 r2108  
    130130        foreach (KeyValuePair<Guid, Executor> kvp in engines) {
    131131          Executor e = kvp.Value;
    132           if (!e.Running && e.CurrentMessage == MessageContainer.MessageType.NoMessage)
     132          if (!e.JobIsFinished)
    133133            prog[e.JobId] = e.Progress;
    134134        }
  • trunk/sources/HeuristicLab.Hive.Client.ExecutionEngine/3.2/Executor.cs

    r2107 r2108  
    3838    public MessageContainer.MessageType CurrentMessage { get; set; }
    3939    public MessageQueue Queue { get; set; }
    40    
     40
     41    public bool JobIsFinished { get; set; }
     42
    4143    public bool Running {
    4244      get {
     
    7779
    7880    void Job_JobStopped(object sender, EventArgs e) {
    79       if (CurrentMessage == MessageContainer.MessageType.NoMessage)
     81      if (CurrentMessage == MessageContainer.MessageType.NoMessage) {
    8082        Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.FinishedJob, JobId));
    81       else if (CurrentMessage == MessageContainer.MessageType.RequestSnapshot)
    82         Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.SnapshotReady, JobId));
    83       else if (CurrentMessage == MessageContainer.MessageType.AbortJob)
    84         Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.JobAborted, JobId));
     83        JobIsFinished = true;
     84      } else if (CurrentMessage == MessageContainer.MessageType.RequestSnapshot) {
     85          Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.SnapshotReady, JobId));
     86      } else if (CurrentMessage == MessageContainer.MessageType.AbortJob) {
     87          Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.JobAborted, JobId));
     88      }
    8589    }
    8690
     
    125129    public Executor() {
    126130      CurrentMessage = MessageContainer.MessageType.NoMessage;
     131      JobIsFinished = false;
    127132      Job = new TestJob();
    128133    }   
Note: See TracChangeset for help on using the changeset viewer.