Changeset 4264 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive

Timestamp:

08/19/10 13:30:56 (14 years ago)

Author:

cneumuel

Message:

Split up "State" to "JobState" and "SlaveState" (#1159)

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive

Files:

• HeuristicLab.Hive.Contracts/3.3/ApplicationConstants.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/CalendarState.cs (added)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/ClientDto.cs (modified) (2 diffs)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/HeartBeatData.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/JobDto.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/JobResult.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/JobState.cs (added)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/SlaveState.cs (added)
• HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Hive.Contracts/3.3/Interfaces/IJobManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs (modified) (3 diffs)
• HeuristicLab.Hive.Experiment/3.3/JobItem.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Console/3.3/AddJobForm.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Console/3.3/HiveServerManagementConsole.cs (modified) (8 diffs)
• HeuristicLab.Hive.Server.Console/3.3/JobDataFetcher.cs (modified) (3 diffs)
• HeuristicLab.Hive.Server.Console/3.3/JobListView.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/3.3/Facades/ServerConsoleFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.3/JobManager.cs (modified) (8 diffs)
• HeuristicLab.Hive.Server.Core/3.3/SlaveCommunicator.cs (modified) (17 diffs)
• HeuristicLab.Hive.Server.DataAccess/3.3/IJobDao.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.3/ClientDao.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.3/JobDao.cs (modified) (7 diffs)
• HeuristicLab.Hive.Slave.Core/3.3/Core.cs (modified) (4 diffs)
• HeuristicLab.Hive.Slave.Core/3.3/Heartbeat.cs (modified) (4 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/ApplicationConstants.cs

@@ -35 +35 @@
     /// </summary>
     public static System.Transactions.IsolationLevel ISOLATION_LEVEL_SCOPE = System.Transactions.IsolationLevel.ReadUncommitted;
+
     public static int HEARTBEAT_MAX_DIF = 120; // value in seconds
+    
     public static int JOB_TIME_TO_LIVE = 5;
-
-    //public static string RESPONSE_SERVERCONSOLE_LOGIN_SUCCESS = "Logged in";
-    //public static string RESPONSE_SERVERCONSOLE_LOGIN_FAILED = "Login failed";
-
-    //public static string RESPONSE_USERROLE_GET_ALL_USERS = "UserRole.GetAllUsers";
-    //public static string RESPONSE_USERROLE_USER_EXISTS_ALLREADY = "UserRole.UserExistsAllready";
-    //public static string RESPONSE_USERROLE_USER_SUCCESSFULLY_ADDED = "UserRole.UserSuccessfullyAdded";
-    //public static string RESPONSE_USERROLE_USER_DOESNT_EXIST = "UserRole.UserDoesntExist";
-    //public static string RESPONSE_USERROLE_USER_REMOVED = "UserRole.UserRemoved";
-    //public static string RESPONSE_USERROLE_USERGROUP_EXISTS_ALLREADY = "UserRole.UsergroupExistsAllready";
-    //public static string RESPONSE_USERROLE_USERGROUP_ADDED = "UserRole.UserGroupAdded";
-    //public static string RESPONSE_USERROLE_USERGROUP_DOESNT_EXIST = "UserRole.UserGroupDoesntExist";
-    //public static string RESPONSE_USERROLE_PERMISSIONOWNER_DOESNT_EXIST = "UserRole.PermissionOwnerDoesntExist";
-    //public static string RESPONSE_USERROLE_PERMISSIONOWNER_REMOVED = "UserRole.PermissionOwnerRemoved";
-    //public static string RESPONSE_USERROLE_PERMISSIONOWNER_ADDED = "UserRole.PermissionOwnerAdded";
-    //public static string RESPONSE_USERROLE_GET_ALL_USERGROUPS = "UserRole.AllUserGroupsReturned";
-    //public static string RESPONSE_USERROLE_ID_MUST_NOT_BE_SET = "UserRole.IdMustNotBeSet";
-    //public static string RESPONSE_USERROLE_USERGROUP_ADDED_TO_USERGROUP = "UserRole.UserGroupAddedToUserGroup";
-    //public static string RESPONSE_USERROLE_USERNAME_EXISTS_ALLREADY = "UserRole.UsernameExistsAllready";
-
-    //public static string RESPONSE_CLIENT_GET_ALL_CLIENTS = "Client.GetAllClients";
-    //public static string RESPONSE_CLIENT_GET_ALL_CLIENTGROUPS = "Client.GetAllClientGroups";
-    //public static string RESPONSE_CLIENT_ID_MUST_NOT_BE_SET = "Client.IdMustNotBeSet";
-    //public static string RESPONSE_CLIENT_CLIENTGROUP_ADDED = "Client.ClientGroupAdded";
-    //public static string RESPONSE_CLIENT_CLIENTGROUP_DOESNT_EXIST = "Client.ClientGroupDoesntExist";
-    //public static string RESPONSE_CLIENT_CLIENTGROUP_DELETED = "Client group sucessfully deleted"; 
-    //public static string RESPONSE_CLIENT_RESOURCE_ADDED_TO_GROUP = "Client.ResourceAddedToGroup";
-    //public static string RESPONSE_CLIENT_RESOURCE_REMOVED = "Client.ResourceRemoved";
-    //public static string RESPONSE_CLIENT_RESOURCE_NOT_FOUND = "Client.ResourceNotFound";
-    //public static string RESPONSE_CLIENT_PERMISSIONOWNER_DOESNT_EXIST = "Client.PermissionOwnerDoesntExist";
-    //public static string RESPONSE_CLIENT_GET_GROUPS_OF_CLIENT = "Get all groups of a client";
-
-    //public static string RESPONSE_COMMUNICATOR_HEARTBEAT_RECEIVED = "Communicator.HeardbeatReceived";
-    //public static string RESPONSE_COMMUNICATOR_JOB_PULLED = "Communicator.JobPulled";
-    //public static string RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED = "Communicator.JobResultReceived";
-    //public static string RESPONSE_COMMUNICATOR_LOGIN_USER_ALLREADY_ONLINE = "Communicator.LoginUserAllreadyOnline";
-    //public static string RESPONSE_COMMUNICATOR_LOGIN_SUCCESS = "Communicator.LoginSuccess";
-    //public static string RESPONSE_COMMUNICATOR_LOGOUT_CLIENT_NOT_REGISTERED = "Communicator.LogoutClientNotRegistered";
-    //public static string RESPONSE_COMMUNICATOR_LOGOUT_SUCCESS = "Communicator.LogoutSuccess";
-    //public static string RESPONSE_COMMUNICATOR_NO_JOBS_LEFT = "Communicator.NoJobsLeft";
-    //public static string RESPONSE_COMMUNICATOR_ID_MUST_NOT_BE_SET = "Communicator.IdMustNotBeSet";
-    //public static string RESPONSE_COMMUNICATOR_NO_JOB_WITH_THIS_ID = "Communicator.NoJobWithThisId";
-    //public static string RESPONSE_COMMUNICATOR_WRONG_JOB_STATE = "Communicator.WrongJobState";
-    //public static string RESPONSE_COMMUNICATOR_USER_NOT_LOGGED_IN = "Communicator.UserNotLoggedIn";
-    //public static string RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED = "Communicator.JobIsNotBeenigCalculated";
-    //public static string RESPONSE_COMMUNICATOR_WRONG_CLIENT_FOR_JOB = "Communicator.WrongClientForJob";
-    //public static string RESPONSE_COMMUNICATOR_JOB_ALLREADY_FINISHED = "Job allready finished. Not needed anymore";
-    //public static string RESPONSE_COMMUNICATOR_JOB_DOESNT_EXIST = "No job exists with this id";
-    //public static string RESPONSE_COMMUNICATOR_SEND_JOBRESULT = "Please send the Jobresult to the server";
-    //public static string RESPONSE_COMMUNICATOR_PLUGINS_SENT = "Communicator.PluginsSent";
-    //public static string RESPONSE_COMMUNICATOR_PLUGINS_NOT_AVAIL = "Communicator.PluginsNotAvail";
-    //public static string RESPONSE_COMMUNICATOR_JOB_WAS_ABORTED = "Job was aborted";
-
-    //public static string RESPONSE_COMMUNICATOR_FETCH_OR_FORCEFETCH_CALENDAR = "new Calendar must be fetched / force fetched";
-
-    //public static string RESPONSE_JOB_ALL_JOBS = "Job.AllJobs";
-    //public static string RESPONSE_JOB_GET_JOB_BY_ID = "Job.GetJobById";
-    //public static string RESPONSE_JOB_ID_MUST_NOT_BE_SET = "Job.IdMustNotBeSet";
-    //public static string RESPONSE_JOB_JOB_ADDED = "Job.JobAdded";
-    //public static string RESPONSE_JOB_JOB_NULL = "Job.JobNull";
-    //public static string RESPONSE_JOB_JOB_DOESNT_EXIST = "JobDoesntExist";
-    //public static string RESPONSE_JOB_JOB_REMOVED = "Job.JobRemoved";
-    //public static string RESPONSE_JOB_JOBSTATE_MUST_BE_OFFLINE = "Job.JobStateMustBeOffline";
-    //public static string RESPONSE_JOB_IS_NOT_BEEING_CALCULATED = "Job.IsNotBeeingCalculated";
-    //public static string RESPONSE_JOB_JOB_RESULT_SENT = "Job.JobResultSent";
-    //public static string RESPONSE_JOB_REQUEST_ALLREADY_SET = "Job.RequestAllreadySet";
-    //public static string RESPONSE_JOB_ABORT_REQUEST_ALLREADY_SET = "Job.AbortRequestAllreadySet";
-    //public static string RESPONSE_JOB_REQUEST_SET = "Job.RequestSet";
-    //public static string RESPONSE_JOB_ABORT_REQUEST_SET = "Job.AbortRequestSet";
-    //public static string RESPONSE_JOB_RESULT_NOT_YET_HERE = "Requested job result is not yet finished";
-    //public static string RESPONSE_JOB_PROJECT_NAME_EMPTY = "Please specifiy a project name";
-    //public static string RESPONSE_JOB_PROJECT_ADDED = "Project successfully added";
-    //public static string RESPONSE_JOB_PROJECT_DOESNT_EXIST = "The specified project doesn't exist";
-    //public static string RESPONSE_JOB_PROJECT_DELETED = "The project was sucessfully deleted";
-
-    //public static string RESPONSE_UPTIMECALENDAR_NO_CALENDAR_FOUND = "No Calendar could be found anywhere in the tree";
-    //public static string RESPONSE_UPTIMECALENDAR_STATUS_UPDATED = "Calendar status has been updated";
   }
 }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/BusinessObjects/ClientDto.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Hive.Contracts.BusinessObjects {
-
-  public enum State { NullState, Idle, Calculating, Offline, Finished, Abort, RequestSnapshot, RequestSnapshotSent, Pending, Failed };
-  public enum CalendarState { Fetch, ForceFetch, Fetching, Fetched, NotAllowedToFetch };
-
   [StorableClass]
   [DataContract]
@@ -57 +53 @@
     [Storable]
     [DataMember]
-    public State State { get; set; }
+    public SlaveState State { get; set; }
     [Storable]
     [DataMember]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/BusinessObjects/HeartBeatData.cs

@@ -38 +38 @@
     [DataMember]
     public Dictionary<Guid, double> JobProgress { get; set; } // TODO: define Type 
+    [DataMember]
+    public bool IsAllowedToCalculate { get; set; } // this is true if slave is allowed to work according to calendar
 
     public override string ToString() {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/BusinessObjects/JobDto.cs

@@ -38 +38 @@
     [Storable]
     [DataMember]
-    public State State { get; set; }
+    public JobState State { get; set; }
     [Storable]
     [DataMember]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/BusinessObjects/JobResult.cs

@@ -44 +44 @@
     [Storable]
     [DataMember]
-    public State State { get; set; }
+    public JobState State { get; set; }
     [Storable]
     [DataMember]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj

@@ -118 +118 @@
     <Compile Include="BusinessObjects\AppointmentDto.cs" />
     <Compile Include="BusinessObjects\CachedHivePluginInfoDto.cs" />
+    <Compile Include="BusinessObjects\CalendarState.cs" />
     <Compile Include="BusinessObjects\ClientGroupDto.cs" />
     <Compile Include="BusinessObjects\HivePluginFile.cs" />
     <Compile Include="BusinessObjects\JobResultList.cs" />
+    <Compile Include="BusinessObjects\JobState.cs" />
     <Compile Include="BusinessObjects\ResourceDto.cs" />
     <Compile Include="BusinessObjects\SerializedJob.cs" />
@@ -129 +131 @@
     <Compile Include="BusinessObjects\JobResult.cs" />
     <Compile Include="BusinessObjects\SerializedJobResult.cs" />
+    <Compile Include="BusinessObjects\SlaveState.cs" />
     <Compile Include="BusinessObjects\UpTimeStatisticsDto.cs" />
     <Compile Include="BusinessObjects\ClientDto.cs" />

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/Interfaces/IJobManager.cs

@@ -36 +36 @@
 
     [OperationContract]
-    ResponseList<JobDto> GetAllJobsWithFilter(State jobState, int offset, int count);
+    ResponseList<JobDto> GetAllJobsWithFilter(JobState jobState, int offset, int count);
 
     [OperationContract]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs

@@ -447 +447 @@
       JobItem jobItem = (JobItem)sender;
       Thread t = new Thread(() => {
-        if (jobItem.State == State.Finished) {
+        if (jobItem.State == JobState.Finished) {
           FetchAndUpdateJob(jobItem.JobDto.Id);
           DisposeOptimizerMappings(jobItem.JobDto.Id);
-        } else if (jobItem.State == State.Failed) {
+        } else if (jobItem.State == JobState.Failed) {
           DisposeOptimizerMappings(jobItem.JobDto.Id);
         }
@@ -517 +517 @@
         CoresNeeded = 1, // [chn] how to determine real cores needed?
         PluginsNeeded = pluginsNeeded,
-        State = State.Offline,
+        State = JobState.Offline,
         MemoryNeeded = 0,
         UserId = Guid.Empty // [chn] set real userid here!
@@ -556 +556 @@
             IExecutionEngineFacade executionEngineFacade = GetExecutionEngineFacade();
             IEnumerable<Guid> jobIdsToQuery = from job in JobItems
-                                              where job.State != State.Finished &&
-                                              job.State != State.Failed
+                                              where job.State != JobState.Finished &&
+                                              job.State != JobState.Failed
                                               select job.JobDto.Id;
             if (jobIdsToQuery.Count() > 0) {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/JobItem.cs

@@ -22 +22 @@
     public override Image ItemImage {
       get {
-        if (State == State.Offline) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutablePrepared;
-        else if (State == State.Idle) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutablePrepared;
-        else if (State == State.Calculating) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStarted;
-        else if (State == State.Abort) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
-        else if (State == State.Failed) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Error;
-        else if (State == State.Finished) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
+        if (State == JobState.Offline) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutablePrepared;
+        else if (State == JobState.Calculating) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStarted;
+        else if (State == JobState.Aborted) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
+        else if (State == JobState.Failed) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Error;
+        else if (State == JobState.Finished) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
         else return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event;
       }
@@ -63 +62 @@
     }
 
-    public State State {
+    public JobState State {
       get { return jobResult != null ? JobResult.State : JobDto.State; }
     }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/AddJobForm.cs

@@ -111 +111 @@
         if (numJobs > 0) {
           for (int i = 0; i < numJobs; i++) {
-            JobDto job = new JobDto { State = State.Offline, CoresNeeded = 1 };
+            JobDto job = new JobDto { State = JobState.Offline, CoresNeeded = 1 };
             
             // if project selected (0 -> none)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerManagementConsole.cs

@@ -110 +110 @@
     void jdf_NewDataAvailable(object sender, EventArgs e) {
       JobDataFetcher fetcher = (JobDataFetcher) sender;
-      if (fetcher.PollStates.Contains(State.Finished)) {
-        updateJobListView(fetcher, lv_finishedJobs, 0);
-      } else if(fetcher.PollStates.Contains(State.Calculating)) {
-        updateJobListView(fetcher, lv_calculatingJobs, 1);
-      } else if (fetcher.PollStates.Contains(State.Offline)) {
-        updateJobListView(fetcher, lv_offlineJobs, 2);
-      }
-    }
-
-    private void updateJobListView(JobDataFetcher fetcher, ListView listView, int category) {
+      if (fetcher.PollStates.Contains(JobState.Finished)) {
+        UpdateJobListView(fetcher, lv_finishedJobs, 0);
+      } else if(fetcher.PollStates.Contains(JobState.Calculating)) {
+        UpdateJobListView(fetcher, lv_calculatingJobs, 1);
+      } else if (fetcher.PollStates.Contains(JobState.Offline)) {
+        UpdateJobListView(fetcher, lv_offlineJobs, 2);
+      }
+    }
+
+    private void UpdateJobListView(JobDataFetcher fetcher, ListView listView, int category) {
       if (listView.InvokeRequired) {
-        listView.Invoke(new updateListView(updateJobListView), new object[] { fetcher, listView, category });
+        listView.Invoke(new updateListView(UpdateJobListView), new object[] { fetcher, listView, category });
       } else {
         listView.BeginUpdate();
@@ -137 +137 @@
     private void Init() {
 
-      jdfFinished = new JobDataFetcher(new State[] {State.Finished}, 50);
-      jdfCalculating = new JobDataFetcher(new State[] {State.Calculating}, 50);
-      jdfOffline = new JobDataFetcher(new State[] {State.Offline}, 50);
+      jdfFinished = new JobDataFetcher(new JobState[] {JobState.Finished}, 50);
+      jdfCalculating = new JobDataFetcher(new JobState[] {JobState.Calculating}, 50);
+      jdfOffline = new JobDataFetcher(new JobState[] {JobState.Offline}, 50);
 
       cmb_finishedJob_count.SelectedItem = "50";
@@ -348 +348 @@
           int percentageUsage = CapacityRam(((ClientDto)resource).NrOfCores, ((ClientDto)resource).NrOfFreeCores);
           int usage = 3;
-          if ((((ClientDto)resource).State != State.Offline) &&
-            (((ClientDto)resource).State != State.NullState)) {
+          if ((((ClientDto)resource).State != SlaveState.Offline) &&
+            (((ClientDto)resource).State != SlaveState.NullState)) {
             if ((percentageUsage >= 0) && (percentageUsage <= 25)) {
               usage = 0;
@@ -419 +419 @@
       //lvSnapshots.Enabled = true;
 
-      if (job.State == State.Offline) {
+      if (job.State == JobState.Offline) {
         pbJobControl.Image = ilLargeImgJob.Images[2];
-      } else if (job.State == State.Calculating) {
+      } else if (job.State == JobState.Calculating) {
         pbJobControl.Image = ilLargeImgJob.Images[1];
-      } else if (job.State == State.Finished) {
+      } else if (job.State == JobState.Finished) {
         pbJobControl.Image = ilLargeImgJob.Images[0];
       }
@@ -480 +480 @@
         lvJobDetails.Items.Add(lvi);
 
-        if (job.State == State.Finished) {
+        if (job.State == JobState.Finished) {
           lvi = null;
             lvi = new ListViewItem();
@@ -500 +500 @@
         int percentageUsage = CapacityRam(currentClient.NrOfCores, currentClient.NrOfFreeCores);
         int usage = 3;
-        if ((currentClient.State != State.Offline) && (currentClient.State != State.NullState)) {
+        if ((currentClient.State != SlaveState.Offline) && (currentClient.State != SlaveState.NullState)) {
           if ((percentageUsage >= 0) && (percentageUsage <= 25)) {
             usage = 0;
@@ -630 +630 @@
         JobDto selectedJob = (JobDto)jlv.SelectedItems[0].Tag;
 
-        if (selectedJob != null && selectedJob.State == State.Calculating) {
+        if (selectedJob != null && selectedJob.State == JobState.Calculating) {
           jlv.ContextMenuStrip.Items.Add(offlineItemAbortJob);
           jlv.ContextMenuStrip.Items.Add(menuItemGetSnapshot);
@@ -806 +806 @@
               change = true;
             }
-            if (job.State != State.Offline) {
+            if (job.State != JobState.Offline) {
               if ((!IsEqual(job.Client, jobold.Client)) || (job.State != jobold.State)
                    || (job.Percentage != jobold.Percentage)) {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/JobDataFetcher.cs

@@ -13 +13 @@
 namespace HeuristicLab.Hive.Server.ServerConsole {
   public class JobDataFetcher {
-    private List<State> pollStates;
+    private List<JobState> pollStates;
 
-    public IEnumerable<State> PollStates {
+    public IEnumerable<JobState> PollStates {
       get { return pollStates; }
     }
@@ -48 +48 @@
     public int CurrentPage { get; set; }
 
-    public JobDataFetcher(IEnumerable<State> states, int nrOfEntries) {
-      pollStates = new List<State>();
+    public JobDataFetcher(IEnumerable<JobState> states, int nrOfEntries) {
+      pollStates = new List<JobState>();
       CachedJobs = new List<JobDto>();
       NrOfEntriesOnPage = nrOfEntries;
@@ -85 +85 @@
       // * using for loop
 
-      State[] pollStatesCopy = PollStates.ToArray();
+      JobState[] pollStatesCopy = PollStates.ToArray();
       for (int i = 0; i < pollStatesCopy.Length; i++) {
         ResponseList<JobDto> resList = jobManager.GetAllJobsWithFilter(pollStatesCopy[i], CurrentPage * NrOfEntriesOnPage, NrOfEntriesOnPage);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/JobListView.cs

@@ -28 +28 @@
     private JobDataFetcher jdf;
 
-    public JobListView(IEnumerable<State> states, int nrOfEntries)
+    public JobListView(IEnumerable<JobState> states, int nrOfEntries)
       : base() {
       InitializeComponent();
@@ -40 +40 @@
       JobDataFetcher datafetcher = (JobDataFetcher) sender;
       this.BeginUpdate();
-      if (datafetcher.PollStates.Contains(State.Finished)) {
+      if (datafetcher.PollStates.Contains(JobState.Finished)) {
         this.Items.Clear();
         ListViewItem lviDummy = new ListViewItem("blahr", 0);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs

@@ -21 +21 @@
 
     public bool ExistsJobForSlave(HeartBeatData hbData) {
-      List<JobDto> allOfflineJobsForSlave = new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(State.Offline, hbData.FreeCores, hbData.FreeMemory, hbData.SlaveId));
+      List<JobDto> allOfflineJobsForSlave = new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(JobState.Offline, hbData.FreeCores, hbData.FreeMemory, hbData.SlaveId));
       return (allOfflineJobsForSlave != null && allOfflineJobsForSlave.Count > 0);
     }
@@ -31 +31 @@
         using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
           ClientDto slave = DaoLocator.ClientDao.FindById(slaveId);
-          LinkedList<JobDto> allOfflineJobsForSlave = new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(State.Offline, slave.NrOfFreeCores, slave.FreeMemory, slave.Id));
+          LinkedList<JobDto> allOfflineJobsForSlave = new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(JobState.Offline, slave.NrOfFreeCores, slave.FreeMemory, slave.Id));
           if (allOfflineJobsForSlave != null && allOfflineJobsForSlave.Count > 0) {
             jobToCalculate = allOfflineJobsForSlave.First.Value;
-            jobToCalculate.State = State.Calculating;
+            jobToCalculate.State = JobState.Calculating;
             jobToCalculate.Client = slave;
-            jobToCalculate.Client.State = State.Calculating;
+            jobToCalculate.Client.State = SlaveState.Calculating;
             jobToCalculate.DateCalculated = DateTime.Now;
             DaoLocator.JobDao.AssignSlaveToJob(slave.Id, jobToCalculate.Id);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ServerConsoleFacade.cs

@@ -108 +108 @@
     }
 
-    public ResponseList<JobDto> GetAllJobsWithFilter(State jobState, int offset, int count) {
+    public ResponseList<JobDto> GetAllJobsWithFilter(JobState jobState, int offset, int count) {
       using (contextFactory.GetContext(false)) {
         secMan.Authorize("AccessJobs", sessionID, Guid.Empty);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.cs

@@ -58 +58 @@
       List<JobDto> allJobs = new List<JobDto>(DaoLocator.JobDao.FindAll());
       foreach (JobDto curJob in allJobs) {
-        if (curJob.State != State.Calculating && curJob.State != State.Finished) {
+        if (curJob.State != JobState.Calculating && curJob.State != JobState.Finished) {
           DaoLocator.JobDao.SetJobOffline(curJob);
         }
@@ -86 +86 @@
     }
 
-    public ResponseList<JobDto> GetAllJobsWithFilter(State jobState, int offset, int count) {
+    public ResponseList<JobDto> GetAllJobsWithFilter(JobState jobState, int offset, int count) {
       ResponseList<JobDto> response = new ResponseList<JobDto>();
       response.List = new List<JobDto>(DaoLocator.JobDao.FindWithLimitations(jobState, offset, count));
@@ -153 +153 @@
 
       if (job != null && job.JobInfo != null) {
-        if (job.JobInfo.State != State.Offline) {
+        if (job.JobInfo.State != JobState.Offline) {
           response.StatusMessage = ResponseStatus.AddNewJob_JobStateMustBeOffline;
           return response;
@@ -222 +222 @@
 
       //if it's a snapshot but the result hasn't reached the server yet...
-      if (snapshot && (job.State == State.RequestSnapshot || job.State == State.RequestSnapshotSent)) {
+      if (snapshot && (job.State == JobState.SnapshotRequested || job.State == JobState.SnapshotSent)) {
         response.StatusMessage = ResponseStatus.GetLastSerializedResult_JobResultNotYetThere;
 
@@ -229 +229 @@
 
       //if it's NOT a snapshot, NEITHER request NOR is it finished
-      if (!requested && !snapshot && job.State != State.Finished) {
+      if (!requested && !snapshot && job.State != JobState.Finished) {
         response.StatusMessage = ResponseStatus.GetLastSerializedResult_JobResultNotYetThere;
 
@@ -248 +248 @@
 
       JobDto job = DaoLocator.JobDao.FindById(jobId);
-      if (job.State == State.RequestSnapshot || job.State == State.RequestSnapshotSent) {
+      if (job.State == JobState.SnapshotRequested || job.State == JobState.SnapshotSent) {
         response.StatusMessage = ResponseStatus.RequestSnapshot_SnapshotAlreadyRequested;
         return response;
       }
-      if (job.State != State.Calculating) {
+      if (job.State != JobState.Calculating) {
         response.StatusMessage = ResponseStatus.RequestSnapshot_JobIsNotBeeingCalculated;
         return response;
       }
       // job is in correct state
-      job.State = State.RequestSnapshot;
+      job.State = JobState.SnapshotRequested;
       DaoLocator.JobDao.Update(job);
 
@@ -275 +275 @@
         return response; // no commit needed
       }
-      if (job.State == State.Abort) {
+      if (job.State == JobState.Aborted) {
         //response.Success = true;
         response.StatusMessage = ResponseStatus.AbortJob_AbortAlreadyRequested;
         return response; // no commit needed
       }
-      if (job.State != State.Calculating && job.State != State.RequestSnapshot && job.State != State.RequestSnapshotSent) {
+      if (job.State != JobState.Calculating && job.State != JobState.SnapshotRequested && job.State != JobState.SnapshotSent) {
         //response.Success = false;
         response.StatusMessage = ResponseStatus.AbortJob_JobIsNotBeeingCalculated;
@@ -286 +286 @@
       }
       // job is in correct state
-      job.State = State.Abort;
+      job.State = JobState.Aborted;
       DaoLocator.JobDao.Update(job);
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveCommunicator.cs

@@ -83 +83 @@
 
         foreach (ClientDto client in allClients) {
-          if (client.State != State.Offline && client.State != State.NullState) {
+          if (client.State != SlaveState.Offline && client.State != SlaveState.NullState) {
             heartbeatLock.EnterUpgradeableReadLock();
 
@@ -89 +89 @@
               Logger.Info("Client " + client.Id +
                               " wasn't offline but hasn't sent heartbeats - setting offline");
-              client.State = State.Offline;
+              client.State = SlaveState.Offline;
               DaoLocator.ClientDao.Update(client);
               Logger.Info("Client " + client.Id +
@@ -114 +114 @@
                 Logger.Debug("setting client offline");
                 // client must be set offline
-                client.State = State.Offline;
+                client.State = SlaveState.Offline;
 
                 //clientAdapter.Update(client);
@@ -147 +147 @@
 
     private void CheckForPendingJobs() {
-      IList<JobDto> pendingJobsInDB = new List<JobDto>(DaoLocator.JobDao.GetJobsByState(State.Pending));
+      IList<JobDto> pendingJobsInDB = new List<JobDto>(DaoLocator.JobDao.GetJobsByState(JobState.Pending));
 
       foreach (JobDto currJob in pendingJobsInDB) {
@@ -153 +153 @@
           if (pendingJobs.ContainsKey(currJob.Id)) {
             if (pendingJobs[currJob.Id] <= 0) {
-              currJob.State = State.Offline;
+              currJob.State = JobState.Offline;
               DaoLocator.JobDao.Update(currJob);
             } else {
@@ -186 +186 @@
       //Really set offline? 
       //Reconnect issues with the currently calculating jobs
-      slaveInfo.State = State.Idle;
+      slaveInfo.State = SlaveState.Idle;
       slaveInfo.CalendarSyncStatus = dbClient != null ? dbClient.CalendarSyncStatus : CalendarState.NotAllowedToFetch;
 
@@ -255 +255 @@
       Logger.Debug("END Finished Client Fetching");
       // check if the client is logged in
-      if (client.State == State.Offline || client.State == State.NullState) {
+      if (client.State == SlaveState.Offline || client.State == SlaveState.NullState) {
         // response.Success = false;
         response.StatusMessage = ResponseStatus.ProcessHeartBeat_UserNotLoggedIn;
@@ -359 +359 @@
             response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
             Logger.Error("There is no job calculated by this user " + hbData.SlaveId + " Job: " + curJob);
-          } else if (curJob.State == State.Abort) {
+          } else if (curJob.State == JobState.Aborted) {
             // a request to abort the job has been set
             response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
-            curJob.State = State.Finished;
+            curJob.State = JobState.Finished;
           } else {
             // save job progress
             curJob.Percentage = jobProgress.Value;
 
-            if (curJob.State == State.RequestSnapshot) {
+            if (curJob.State == JobState.SnapshotRequested) {
               // a request for a snapshot has been set
               response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.RequestSnapshot, curJob.Id));
-              curJob.State = State.RequestSnapshotSent;
+              curJob.State = JobState.SnapshotSent;
             }
           }
@@ -394 +394 @@
                 Logger.Error("Job TTL reached Zero, Job gets removed: " + currJob + " and set back to offline. User that sucks: " + currJob.Client);
 
-                currJob.State = State.Offline;
+                currJob.State = JobState.Offline;
                 DaoLocator.JobDao.Update(currJob);
 
@@ -403 +403 @@
             } else {
               Logger.Error("Job ID wasn't with the heartbeats:  " + currJob);
-              currJob.State = State.Offline;
+              currJob.State = JobState.Offline;
               DaoLocator.JobDao.Update(currJob);
             }
@@ -516 +516 @@
         return response;
       }
-      if (job.JobInfo.State == State.Abort) {
+      if (job.JobInfo.State == JobState.Aborted) {
         //response.Success = false;
         response.StatusMessage = ResponseStatus.ProcessJobResult_JobAborted;
@@ -545 +545 @@
         return response;
       }
-      if (job.JobInfo.State == State.Finished) {
+      if (job.JobInfo.State == JobState.Finished) {
         response.StatusMessage = ResponseStatus.Ok;
         response.JobId = jobId;
@@ -555 +555 @@
       }
       //Todo: RequestsnapshotSent => calculating?
-      if (job.JobInfo.State == State.RequestSnapshotSent) {
-        job.JobInfo.State = State.Calculating;
-      }
-      if (job.JobInfo.State != State.Calculating && job.JobInfo.State != State.Pending) {
+      if (job.JobInfo.State == JobState.SnapshotSent) {
+        job.JobInfo.State = JobState.Calculating;
+      }
+      if (job.JobInfo.State != JobState.Calculating && job.JobInfo.State != JobState.Pending) {
         //response.Success = false;
         response.StatusMessage = ResponseStatus.ProcessJobResult_InvalidJobState;
@@ -571 +571 @@
 
       if (!string.IsNullOrEmpty(exception)) {
-        job.JobInfo.State = State.Failed;
+        job.JobInfo.State = JobState.Failed;
         job.JobInfo.Exception = exception;
         job.JobInfo.DateFinished = DateTime.Now;
       } else if (finished) {
-        job.JobInfo.State = State.Finished;
+        job.JobInfo.State = JobState.Finished;
         job.JobInfo.DateFinished = DateTime.Now;
       }
@@ -638 +638 @@
         return response;
       }
-      if (client.State == State.Calculating) {
+      if (client.State == SlaveState.Calculating) {
         // check wich job the client was calculating and reset it
         IEnumerable<JobDto> jobsOfClient = DaoLocator.JobDao.FindActiveJobsOfSlave(client);
         foreach (JobDto job in jobsOfClient) {
-          if (job.State != State.Finished)
+          if (job.State != JobState.Finished)
             DaoLocator.JobDao.SetJobOffline(job);
         }
       }
 
-      client.State = State.Offline;
+      client.State = SlaveState.Offline;
       DaoLocator.ClientDao.Update(client);
 
@@ -668 +668 @@
         return response;
       }
-      if (job.State == State.Finished) {
+      if (job.State == JobState.Finished) {
         //response.Success = true;
         response.StatusMessage = ResponseStatus.IsJobStillNeeded_JobAlreadyFinished;
@@ -674 +674 @@
         return response;
       }
-      job.State = State.Pending;
+      job.State = JobState.Pending;
       lock (pendingJobs) {
         pendingJobs.Add(job.Id, PENDING_TIMEOUT);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.DataAccess/3.3/IJobDao.cs

@@ -9 +9 @@
     IEnumerable<JobDto> FindActiveJobsOfSlave(ClientDto slave);
 
-    IEnumerable<JobDto> GetJobsByState(State state);
+    IEnumerable<JobDto> GetJobsByState(JobState state);
 
     void AssignSlaveToJob(Guid slaveId, Guid jobId);
@@ -19 +19 @@
     byte[] GetBinaryJobFile(Guid jobId); 
 
-    IEnumerable<JobDto> FindFittingJobsForSlave(State state, int freeCores, int freeMemory, Guid slaveGuid);
+    IEnumerable<JobDto> FindFittingJobsForSlave(JobState state, int freeCores, int freeMemory, Guid slaveGuid);
     Stream GetSerializedJobStream(Guid jobId);
 
-    IEnumerable<JobDto> FindWithLimitations(State jobState, int offset, int count);
+    IEnumerable<JobDto> FindWithLimitations(JobState jobState, int offset, int count);
 
     void SetBinaryJobFile(Guid jobId, byte[] data);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/ClientDao.cs

@@ -83 +83 @@
       target.NumberOfCores = source.NrOfCores;
       target.NumberOfFreeCores = source.NrOfFreeCores;
-      target.Status = Enum.GetName(typeof(State), source.State);
+      target.Status = Enum.GetName(typeof(JobState), source.State);
       return target;
     }
@@ -101 +101 @@
       target.NrOfCores = source.NumberOfCores ?? 0;
       target.NrOfFreeCores = source.NumberOfFreeCores ?? 0;
-      target.State = (State) Enum.Parse(typeof (State), source.Status, true);
+      target.State = (SlaveState)Enum.Parse(typeof(SlaveState), source.Status, true);
       return target;
     } 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/JobDao.cs

@@ -25 +25 @@
     }
 
-    public IEnumerable<JobDto> FindWithLimitations(State jobState, int offset, int count) {
+    public IEnumerable<JobDto> FindWithLimitations(JobState jobState, int offset, int count) {
       IQueryable<JobDto> query = null;
-      if (jobState == State.Finished) {
+      if (jobState == JobState.Finished) {
          query = from job in Context.Jobs
-                 where job.JobState == Enum.GetName(typeof (State), jobState)
+                 where job.JobState == Enum.GetName(typeof (JobState), jobState)
                  orderby job.DateFinished
                  select EntityToDto(job, null);
-      } else if (jobState == State.Calculating || jobState == State.RequestSnapshot || jobState == State.RequestSnapshotSent) {
+      } else if (jobState == JobState.Calculating || jobState == JobState.SnapshotRequested || jobState == JobState.SnapshotSent) {
         query = from job in Context.Jobs
-                    where job.JobState == Enum.GetName(typeof(State), jobState)
+                    where job.JobState == Enum.GetName(typeof(JobState), jobState)
                     orderby job.DateCalculated
                     select EntityToDto(job, null);
       } else {
         query = from job in Context.Jobs
-                    where job.JobState == Enum.GetName(typeof(State), jobState)
+                    where job.JobState == Enum.GetName(typeof(JobState), jobState)
                     orderby job.DateCreated
                     select EntityToDto(job, null);
@@ -95 +95 @@
     public IEnumerable<JobDto> FindActiveJobsOfSlave(ClientDto client) {
       return (from j in Context.Jobs
-              where (j.JobState == Enum.GetName(typeof (State), State.Calculating) ||
-                     j.JobState == Enum.GetName(typeof (State), State.Abort) ||
-                     j.JobState == Enum.GetName(typeof (State), State.RequestSnapshot) ||
-                     j.JobState == Enum.GetName(typeof (State), State.RequestSnapshotSent)) &&
+              where (j.JobState == Enum.GetName(typeof (JobState), JobState.Calculating) ||
+                     j.JobState == Enum.GetName(typeof (JobState), JobState.Aborted) ||
+                     j.JobState == Enum.GetName(typeof (JobState), JobState.SnapshotRequested) ||
+                     j.JobState == Enum.GetName(typeof (JobState), JobState.SnapshotSent)) &&
                     (j.ResourceId.Equals(client.Id))
               select EntityToDto(j, null)).ToList();
     }
 
-    public IEnumerable<JobDto> FindFittingJobsForSlave(State state, int freeCores, int freeMemory, Guid clientId) {
+    public IEnumerable<JobDto> FindFittingJobsForSlave(JobState state, int freeCores, int freeMemory, Guid clientId) {
       ClientGroupDao cgd = new ClientGroupDao();
       
@@ -111 +111 @@
       
       var q = (from ar in Context.AssignedResources               
-               where ar.Job.JobState == Enum.GetName(typeof (State), State.Offline) &&
+               where ar.Job.JobState == Enum.GetName(typeof (JobState), JobState.Offline) &&
                      ar.Job.CoresNeeded <= freeCores &&
                      ar.Job.MemoryNeeded <= freeMemory &&
@@ -120 +120 @@
     }
 
-    public IEnumerable<JobDto> GetJobsByState(State state) {
+    public IEnumerable<JobDto> GetJobsByState(JobState state) {
       return (from j in Context.Jobs
-              where (j.JobState == Enum.GetName(typeof (State), state))
+              where (j.JobState == Enum.GetName(typeof (JobState), state))
               select EntityToDto(j, null)).ToList();
     }
@@ -137 +137 @@
       Job j = Context.Jobs.SingleOrDefault(jq => jq.JobId.Equals(job.Id));
       j.Client = null;
-      j.JobState = Enum.GetName(typeof(State), State.Offline); 
+      j.JobState = Enum.GetName(typeof(JobState), JobState.Offline); 
       CommitChanges();
     }
@@ -177 +177 @@
 
       target.Priority = source.Priority;
-      target.JobState = Enum.GetName(typeof(State), source.State);
+      target.JobState = Enum.GetName(typeof(JobState), source.State);
       return target;
     }
@@ -206 +206 @@
       
       target.Priority = source.Priority;
-      target.State = (State) Enum.Parse(typeof (State), source.JobState, true);
+      target.State = (JobState) Enum.Parse(typeof (JobState), source.JobState, true);
       return target;
     }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using HeuristicLab.Hive.Slave.ExecutionEngine;
+using System.IO;
+using System.Threading;
+using HeuristicLab.Core;
+using HeuristicLab.Hive.Contracts;
+using HeuristicLab.Hive.Contracts.BusinessObjects;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 using HeuristicLab.Hive.Slave.Common;
-using System.Threading;
-using System.Reflection;
-using System.Diagnostics;
-using System.Security.Permissions;
-using System.Security.Policy;
-using System.Security;
 using HeuristicLab.Hive.Slave.Communication;
-using HeuristicLab.Hive.Contracts.BusinessObjects;
-using HeuristicLab.Hive.Contracts;
-using System.Runtime.Remoting.Messaging;
-using HeuristicLab.PluginInfrastructure;
-using System.ServiceModel;
-using System.ServiceModel.Description;
+using HeuristicLab.Hive.Slave.Communication.ServerService;
 using HeuristicLab.Hive.Slave.Core.ClientConsoleService;
 using HeuristicLab.Hive.Slave.Core.ConfigurationManager;
-using HeuristicLab.Hive.Slave.Communication.ServerService;
-using HeuristicLab.Hive.JobBase;
 using HeuristicLab.Hive.Slave.Core.JobStorage;
+using HeuristicLab.Hive.Slave.ExecutionEngine;
 using HeuristicLab.Tracing;
-using HeuristicLab.Core;
-using System.IO;
-using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Slave.Core {
@@ -102 +90 @@
 
       //Initialize the heartbeat
-      beat = new Heartbeat { Interval = 10000 };
+      beat = new Heartbeat { Interval = new TimeSpan(0, 0, 10) };
       beat.StartHeartbeat();
 
@@ -171 +159 @@
           Logger.Info("Uptime Limit reached, storing jobs and sending them back");
 
-          //check if there are running jobs
-          if (engines.Count > 0) {
-            //make sure there is no more fetching of jobs while the snapshots get processed
-            CurrentlyFetching = true;
-            //request a snapshot of each running job
-            foreach (KeyValuePair<Guid, Executor> kvp in engines) {
-              kvp.Value.RequestSnapshot();
-            }
-
-          } else {
-            //Disconnect afterwards
-            WcfService.Instance.Disconnect();
-          }
+          ShutdownRunningJobsAndSubmitSnapshots();
           break;
 
@@ -209 +185 @@
           WcfService.Instance.Logout(ConfigManager.Instance.GetClientInfo().Id);
           break;
+      }
+    }
+
+    private void ShutdownRunningJobsAndSubmitSnapshots() {
+      //check if there are running jobs
+      if (engines.Count > 0) {
+        //make sure there is no more fetching of jobs while the snapshots get processed
+        CurrentlyFetching = true;
+        //request a snapshot of each running job
+        foreach (KeyValuePair<Guid, Executor> kvp in engines) {
+          kvp.Value.RequestSnapshot();
+        }
+
       }
     }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Heartbeat.cs

@@ -33 +33 @@
 using HeuristicLab.Hive.Slave.Communication.ServerService;
 using HeuristicLab.Tracing;
+using System.Threading;
 //using BO = HeuristicLab.Hive.Contracts.BusinessObjects;
 
@@ -43 +44 @@
     private bool offline;
 
-    public double Interval { get; set; }
-    private Timer heartbeatTimer = null;
+    public TimeSpan Interval { get; set; }
+
+    private Thread heartBeatThread;
 
     private static object locker = new object();
 
     public Heartbeat() {
-      Interval = 100;
+      Interval = new TimeSpan(0,0,10);
     }
 
-    public Heartbeat(double interval) {
+    public Heartbeat(TimeSpan interval) {
       Interval = interval;
     }
@@ -58 +60 @@
     private WcfService wcfService;
 
+    private bool abortThreadPending;
+
     /// <summary>
     /// Starts the Heartbeat signal.
     /// </summary>
     public void StartHeartbeat() {
-      heartbeatTimer = new System.Timers.Timer();
-      heartbeatTimer.Interval = this.Interval;
-      heartbeatTimer.AutoReset = true;
-      heartbeatTimer.Elapsed += new ElapsedEventHandler(heartbeatTimer_Elapsed);
       wcfService = WcfService.Instance;
       wcfService.ProcessHeartBeatCompleted += new EventHandler<ProcessHeartBeatCompletedEventArgs>(wcfService_ProcessHeartBeatCompleted);
-      heartbeatTimer.Start();
+      abortThreadPending = false;
+      heartBeatThread = GetHeartBeatThread();
+      heartBeatThread.Start();
     }
 
-    /// <summary>
-    /// This Method is called every time the timer ticks
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    void heartbeatTimer_Elapsed(object sender, ElapsedEventArgs e) {
-      lock (locker) {
-        // check if cwfService is disconnected for any reason (should happen at first heartbeat)
-        // [chn] TODO: Client should always send heartbeats. when calendar disallows he should tell the server he does not want to compute anything
-        if (wcfService.ConnState == NetworkEnum.WcfConnState.Disconnected &&
-          (!UptimeManager.Instance.CalendarAvailable || UptimeManager.Instance.IsOnline())) {
-          wcfService.Connect();
-        }
-        if (wcfService.ConnState == NetworkEnum.WcfConnState.Connected) {
-          wcfService.LoginSync(ConfigManager.Instance.GetClientInfo());
-        }
-
-        ClientDto info = ConfigManager.Instance.GetClientInfo();
-
-        PerformanceCounter counter = new PerformanceCounter("Memory", "Available Bytes", true);
-        int mb = (int)(counter.NextValue() / 1024 / 1024);
-
-        HeartBeatData heartBeatData = new HeartBeatData {
-          SlaveId = info.Id,
-          FreeCores = info.NrOfCores - ConfigManager.Instance.GetUsedCores(),
-          FreeMemory = mb,
-          JobProgress = ConfigManager.Instance.GetProgressOfAllJobs()
-        };
-
-        DateTime lastFullHour = DateTime.Parse(DateTime.Now.Hour.ToString() + ":00");
-        TimeSpan span = DateTime.Now - lastFullHour;
-        if (span.TotalSeconds < (Interval / 1000)) {
-          if (UptimeManager.Instance.IsOnline() && UptimeManager.Instance.CalendarAvailable) {
-            //That's quiet simple: Just reconnect and you're good for new jobs
-            if (wcfService.ConnState != NetworkEnum.WcfConnState.Loggedin) {
-              Logger.Info("Client goes online according to timetable");
+    private Thread GetHeartBeatThread() {
+      return new Thread(() => {
+        while (!abortThreadPending) {
+          lock (locker) {
+            // check if cwfService is disconnected for any reason (should happen at first heartbeat)
+            // [chn] TODO: Client should always send heartbeats. when calendar disallows he should tell the server he does not want to compute anything
+            if (wcfService.ConnState == NetworkEnum.WcfConnState.Disconnected) {
               wcfService.Connect();
             }
-          } else {
-            //We have quit a lot of work to do here: snapshot all jobs, submit them back, then disconnect and then pray to god that nothing goes wrong
-            MessageQueue.GetInstance().AddMessage(MessageContainer.MessageType.UptimeLimitDisconnect);
-          }
-        }
-        if (wcfService.ConnState == NetworkEnum.WcfConnState.Failed) {
-          wcfService.Connect();
-        } else if (wcfService.ConnState == NetworkEnum.WcfConnState.Loggedin) {
-          Logger.Debug("Sending Heartbeat: " + heartBeatData);
-          wcfService.ProcessHeartBeatAsync(heartBeatData);
-        }
-      }
+
+            if (wcfService.ConnState == NetworkEnum.WcfConnState.Loggedin) {
+
+              // client is allowed to calculate stuff
+              ClientDto info = ConfigManager.Instance.GetClientInfo();
+              
+              HeartBeatData heartBeatData = new HeartBeatData {
+                SlaveId = info.Id,
+                FreeCores = info.NrOfCores - ConfigManager.Instance.GetUsedCores(),
+                FreeMemory = GetFreeMemory(),
+                JobProgress = ConfigManager.Instance.GetProgressOfAllJobs(),
+                IsAllowedToCalculate = UptimeManager.Instance.IsOnline() && UptimeManager.Instance.CalendarAvailable
+              };
+
+              if (!heartBeatData.IsAllowedToCalculate) {
+                // stop all running jobs and send snapshots to server
+                MessageQueue.GetInstance().AddMessage(MessageContainer.MessageType.UptimeLimitDisconnect);
+              }
+
+              Logger.Debug("Sending Heartbeat: " + heartBeatData);
+              wcfService.ProcessHeartBeatAsync(heartBeatData);
+            }
+
+          } // lock
+          Thread.Sleep(Interval);
+        } // while
+        abortThreadPending = false;
+      });
+    }
+
+    private int GetFreeMemory() {
+      PerformanceCounter counter = new PerformanceCounter("Memory", "Available Bytes", true);
+      int mb = (int)(counter.NextValue() / 1024 / 1024);
+      return mb;
     }
 
@@ -129 +124 @@
 
     public void StopHeartBeat() {
-      heartbeatTimer.Dispose();
+      abortThreadPending = true;
     }
   }