Changeset 6269
- Timestamp:
- 05/24/11 18:01:10 (13 years ago)
- Location:
- branches/HeuristicLab.Hive-3.4/sources
- Files:
-
- 8 edited
-
HeuristicLab.Clients.Hive.Slave/3.4/ConfigManager.cs (modified) (3 diffs)
-
HeuristicLab.Clients.Hive.Slave/3.4/HeartbeatManager.cs (modified) (1 diff)
-
HeuristicLab.Clients.Hive.Slave/3.4/app_ascheibe.config (modified) (3 diffs)
-
HeuristicLab.Clients.Hive.Slave/3.4/app_f005pc.config (modified) (3 diffs)
-
HeuristicLab.Clients.Hive.Slave/3.4/app_services.config (modified) (3 diffs)
-
HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveServiceClient.cs (modified) (9 diffs)
-
HeuristicLab.Services.Hive.Common/3.4/DataTransfer/Heartbeat.cs (modified) (1 diff)
-
HeuristicLab.Services.Hive/3.4/HeartbeatManager.cs (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/ConfigManager.cs
r6257 r6269 48 48 public Core Core { get; set; } 49 49 private Slave slave; 50 private PerformanceCounter cpuCounter; 50 51 51 52 /// <summary> … … 53 54 /// </summary> 54 55 private ConfigManager() { 56 cpuCounter = new PerformanceCounter(); 57 cpuCounter.CategoryName = "Processor"; 58 cpuCounter.CounterName = "% Processor Time"; 59 cpuCounter.InstanceName = "_Total"; 60 55 61 Asleep = false; 56 62 slave = new Slave(); … … 252 258 return mb; 253 259 } 260 261 public float GetCpuUtilization() { 262 return cpuCounter.NextValue(); 263 } 254 264 } 255 265 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeartbeatManager.cs
r6257 r6269 86 86 if (wcfService.ConnState == NetworkEnum.WcfConnState.Connected) { 87 87 Slave info = ConfigManager.Instance.GetClientInfo(); 88 88 89 89 Heartbeat heartBeatData = new Heartbeat { 90 90 SlaveId = info.Id, 91 91 FreeCores = info.Cores.HasValue ? info.Cores.Value - SlaveStatusInfo.UsedCores : 0, 92 92 FreeMemory = ConfigManager.GetFreeMemory(), 93 CpuUtilization = ConfigManager.Instance.GetCpuUtilization(), 93 94 JobProgress = ConfigManager.Instance.GetExecutionTimeOfAllJobs(), 94 95 AssignJob = !ConfigManager.Instance.Asleep -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_ascheibe.config
r6167 r6269 1 1 <?xml version="1.0"?> 2 2 <configuration> 3 <configSections> 4 <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 5 <section name="HeuristicLab.Clients.Hive.Slave.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/> 6 </sectionGroup> 7 </configSections> 8 <userSettings> 9 <HeuristicLab.Clients.Hive.Slave.Properties.Settings> 10 <setting name="Guid" serializeAs="String"> 11 <value>00000000-0000-0000-0000-000000000000</value> 12 </setting> 13 </HeuristicLab.Clients.Hive.Slave.Properties.Settings> 14 </userSettings> 3 <runtime> 4 <gcServer enabled="true" /> 5 </runtime> 6 7 <configSections> 8 <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 9 <section name="HeuristicLab.Clients.Hive.Slave.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/> 10 </sectionGroup> 11 </configSections> 12 <userSettings> 13 <HeuristicLab.Clients.Hive.Slave.Properties.Settings> 14 <setting name="Guid" serializeAs="String"> 15 <value>00000000-0000-0000-0000-000000000000</value> 16 </setting> 17 </HeuristicLab.Clients.Hive.Slave.Properties.Settings> 18 </userSettings> 15 19 16 20 <system.serviceModel> … … 28 32 </bindings> 29 33 <services> 30 <service name="HeuristicLab.Clients.Hive.SlaveCore.SlaveCommunicationService"> 34 <service name="HeuristicLab.Clients.Hive.SlaveCore.SlaveCommunicationService"> 31 35 <endpoint address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/> 32 36 </service> … … 42 46 </system.serviceModel> 43 47 44 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration> 48 <startup> 49 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/> 50 </startup> 51 </configuration> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_f005pc.config
r6167 r6269 1 1 <?xml version="1.0"?> 2 2 <configuration> 3 <configSections> 4 <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 5 <section name="HeuristicLab.Clients.Hive.Slave.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/> 6 </sectionGroup> 7 </configSections> 8 <userSettings> 9 <HeuristicLab.Clients.Hive.Slave.Properties.Settings> 10 <setting name="Guid" serializeAs="String"> 11 <value>00000000-0000-0000-0000-000000000000</value> 12 </setting> 13 </HeuristicLab.Clients.Hive.Slave.Properties.Settings> 14 </userSettings> 3 <runtime> 4 <gcServer enabled="true" /> 5 </runtime> 6 7 <configSections> 8 <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 9 <section name="HeuristicLab.Clients.Hive.Slave.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/> 10 </sectionGroup> 11 </configSections> 12 <userSettings> 13 <HeuristicLab.Clients.Hive.Slave.Properties.Settings> 14 <setting name="Guid" serializeAs="String"> 15 <value>00000000-0000-0000-0000-000000000000</value> 16 </setting> 17 </HeuristicLab.Clients.Hive.Slave.Properties.Settings> 18 </userSettings> 15 19 16 20 <system.serviceModel> … … 28 32 </bindings> 29 33 <services> 30 <service name="HeuristicLab.Clients.Hive.SlaveCore.SlaveCommunicationService"> 34 <service name="HeuristicLab.Clients.Hive.SlaveCore.SlaveCommunicationService"> 31 35 <endpoint address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/> 32 36 </service> … … 42 46 </system.serviceModel> 43 47 44 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration> 48 <startup> 49 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/> 50 </startup> 51 </configuration> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_services.config
r6167 r6269 1 1 <?xml version="1.0"?> 2 2 <configuration> 3 <configSections> 4 <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 5 <section name="HeuristicLab.Clients.Hive.Slave.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/> 6 </sectionGroup> 7 </configSections> 8 <userSettings> 9 <HeuristicLab.Clients.Hive.Slave.Properties.Settings> 10 <setting name="Guid" serializeAs="String"> 11 <value>00000000-0000-0000-0000-000000000000</value> 12 </setting> 13 </HeuristicLab.Clients.Hive.Slave.Properties.Settings> 14 </userSettings> 3 <runtime> 4 <gcServer enabled="true" /> 5 </runtime> 6 7 <configSections> 8 <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 9 <section name="HeuristicLab.Clients.Hive.Slave.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/> 10 </sectionGroup> 11 </configSections> 12 <userSettings> 13 <HeuristicLab.Clients.Hive.Slave.Properties.Settings> 14 <setting name="Guid" serializeAs="String"> 15 <value>00000000-0000-0000-0000-000000000000</value> 16 </setting> 17 </HeuristicLab.Clients.Hive.Slave.Properties.Settings> 18 </userSettings> 15 19 16 20 <system.serviceModel> … … 28 32 </bindings> 29 33 <services> 30 <service name="HeuristicLab.Clients.Hive.SlaveCore.SlaveCommunicationService"> 34 <service name="HeuristicLab.Clients.Hive.SlaveCore.SlaveCommunicationService"> 31 35 <endpoint address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/> 32 36 </service> … … 42 46 </system.serviceModel> 43 47 44 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration> 48 <startup> 49 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/> 50 </startup> 51 </configuration> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveServiceClient.cs
r6267 r6269 14 14 [System.Diagnostics.DebuggerStepThroughAttribute()] 15 15 [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] 16 [System.Runtime.Serialization.DataContractAttribute(Name="Job", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.Common.DataTra" + 17 "nsfer")] 18 [System.SerializableAttribute()] 19 public partial class Job : HeuristicLab.Clients.Hive.LightweightJob 20 { 21 22 [System.Runtime.Serialization.OptionalFieldAttribute()] 23 private int CoresNeededField; 24 25 [System.Runtime.Serialization.OptionalFieldAttribute()] 26 private bool FinishWhenChildJobsFinishedField; 27 28 [System.Runtime.Serialization.OptionalFieldAttribute()] 29 private System.Guid HiveExperimentIdField; 30 31 [System.Runtime.Serialization.OptionalFieldAttribute()] 32 private bool IsParentJobField; 33 34 [System.Runtime.Serialization.OptionalFieldAttribute()] 35 private bool IsPrivilegedField; 36 37 [System.Runtime.Serialization.OptionalFieldAttribute()] 38 private System.Nullable<System.DateTime> LastHeartbeatField; 39 40 [System.Runtime.Serialization.OptionalFieldAttribute()] 41 private int MemoryNeededField; 42 43 [System.Runtime.Serialization.OptionalFieldAttribute()] 44 private System.Collections.Generic.List<System.Guid> PluginsNeededIdsField; 45 46 [System.Runtime.Serialization.OptionalFieldAttribute()] 47 private int PriorityField; 48 49 [System.Runtime.Serialization.DataMemberAttribute()] 50 public int CoresNeeded 51 { 52 get 53 { 54 return this.CoresNeededField; 55 } 56 set 57 { 58 if ((this.CoresNeededField.Equals(value) != true)) 59 { 60 this.CoresNeededField = value; 61 this.RaisePropertyChanged("CoresNeeded"); 62 } 63 } 64 } 65 66 [System.Runtime.Serialization.DataMemberAttribute()] 67 public bool FinishWhenChildJobsFinished 68 { 69 get 70 { 71 return this.FinishWhenChildJobsFinishedField; 72 } 73 set 74 { 75 if ((this.FinishWhenChildJobsFinishedField.Equals(value) != true)) 76 { 77 this.FinishWhenChildJobsFinishedField = value; 78 this.RaisePropertyChanged("FinishWhenChildJobsFinished"); 79 } 80 } 81 } 82 83 [System.Runtime.Serialization.DataMemberAttribute()] 84 public System.Guid HiveExperimentId 85 { 86 get 87 { 88 return this.HiveExperimentIdField; 89 } 90 set 91 { 92 if ((this.HiveExperimentIdField.Equals(value) != true)) 93 { 94 this.HiveExperimentIdField = value; 95 this.RaisePropertyChanged("HiveExperimentId"); 96 } 97 } 98 } 99 100 [System.Runtime.Serialization.DataMemberAttribute()] 101 public bool IsParentJob 102 { 103 get 104 { 105 return this.IsParentJobField; 106 } 107 set 108 { 109 if ((this.IsParentJobField.Equals(value) != true)) 110 { 111 this.IsParentJobField = value; 112 this.RaisePropertyChanged("IsParentJob"); 113 } 114 } 115 } 116 117 [System.Runtime.Serialization.DataMemberAttribute()] 118 public bool IsPrivileged 119 { 120 get 121 { 122 return this.IsPrivilegedField; 123 } 124 set 125 { 126 if ((this.IsPrivilegedField.Equals(value) != true)) 127 { 128 this.IsPrivilegedField = value; 129 this.RaisePropertyChanged("IsPrivileged"); 130 } 131 } 132 } 133 134 [System.Runtime.Serialization.DataMemberAttribute()] 135 public System.Nullable<System.DateTime> LastHeartbeat 136 { 137 get 138 { 139 return this.LastHeartbeatField; 140 } 141 set 142 { 143 if ((this.LastHeartbeatField.Equals(value) != true)) 144 { 145 this.LastHeartbeatField = value; 146 this.RaisePropertyChanged("LastHeartbeat"); 147 } 148 } 149 } 150 151 [System.Runtime.Serialization.DataMemberAttribute()] 152 public int MemoryNeeded 153 { 154 get 155 { 156 return this.MemoryNeededField; 157 } 158 set 159 { 160 if ((this.MemoryNeededField.Equals(value) != true)) 161 { 162 this.MemoryNeededField = value; 163 this.RaisePropertyChanged("MemoryNeeded"); 164 } 165 } 166 } 167 168 [System.Runtime.Serialization.DataMemberAttribute()] 169 public System.Collections.Generic.List<System.Guid> PluginsNeededIds 170 { 171 get 172 { 173 return this.PluginsNeededIdsField; 174 } 175 set 176 { 177 if ((object.ReferenceEquals(this.PluginsNeededIdsField, value) != true)) 178 { 179 this.PluginsNeededIdsField = value; 180 this.RaisePropertyChanged("PluginsNeededIds"); 181 } 182 } 183 } 184 185 [System.Runtime.Serialization.DataMemberAttribute()] 186 public int Priority 187 { 188 get 189 { 190 return this.PriorityField; 191 } 192 set 193 { 194 if ((this.PriorityField.Equals(value) != true)) 195 { 196 this.PriorityField = value; 197 this.RaisePropertyChanged("Priority"); 198 } 199 } 200 } 201 } 202 203 [System.Diagnostics.DebuggerStepThroughAttribute()] 204 [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] 16 205 [System.Runtime.Serialization.DataContractAttribute(Name="HiveItem", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.Common.DataTra" + 17 206 "nsfer")] 18 207 [System.SerializableAttribute()] 19 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.LightweightJob))]20 208 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.StateLog))] 21 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive. Job))]209 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Appointment))] 22 210 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.NamedHiveItem))] 23 211 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.HiveExperiment))] … … 27 215 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Plugin))] 28 216 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.PluginData))] 29 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Appointment))] 217 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.LightweightJob))] 218 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Job))] 30 219 public partial class HiveItem : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged 31 220 { … … 80 269 [System.Diagnostics.DebuggerStepThroughAttribute()] 81 270 [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] 82 [System.Runtime.Serialization.DataContractAttribute(Name="LightweightJob", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.Common.DataTra" +83 "nsfer")]84 [System.SerializableAttribute()]85 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Job))]86 public partial class LightweightJob : HeuristicLab.Clients.Hive.HiveItem87 {88 89 [System.Runtime.Serialization.OptionalFieldAttribute()]90 private System.Nullable<HeuristicLab.Clients.Hive.Command> CommandField;91 92 [System.Runtime.Serialization.OptionalFieldAttribute()]93 private System.TimeSpan ExecutionTimeField;94 95 [System.Runtime.Serialization.OptionalFieldAttribute()]96 private System.DateTime LastJobDataUpdateField;97 98 [System.Runtime.Serialization.OptionalFieldAttribute()]99 private System.Nullable<System.Guid> ParentJobIdField;100 101 [System.Runtime.Serialization.OptionalFieldAttribute()]102 private HeuristicLab.Clients.Hive.JobState StateField;103 104 [System.Runtime.Serialization.OptionalFieldAttribute()]105 private System.Collections.Generic.List<HeuristicLab.Clients.Hive.StateLog> StateLogField;106 107 [System.Runtime.Serialization.DataMemberAttribute()]108 public System.Nullable<HeuristicLab.Clients.Hive.Command> Command109 {110 get111 {112 return this.CommandField;113 }114 set115 {116 if ((this.CommandField.Equals(value) != true))117 {118 this.CommandField = value;119 this.RaisePropertyChanged("Command");120 }121 }122 }123 124 [System.Runtime.Serialization.DataMemberAttribute()]125 public System.TimeSpan ExecutionTime126 {127 get128 {129 return this.ExecutionTimeField;130 }131 set132 {133 if ((this.ExecutionTimeField.Equals(value) != true))134 {135 this.ExecutionTimeField = value;136 this.RaisePropertyChanged("ExecutionTime");137 }138 }139 }140 141 [System.Runtime.Serialization.DataMemberAttribute()]142 public System.DateTime LastJobDataUpdate143 {144 get145 {146 return this.LastJobDataUpdateField;147 }148 set149 {150 if ((this.LastJobDataUpdateField.Equals(value) != true))151 {152 this.LastJobDataUpdateField = value;153 this.RaisePropertyChanged("LastJobDataUpdate");154 }155 }156 }157 158 [System.Runtime.Serialization.DataMemberAttribute()]159 public System.Nullable<System.Guid> ParentJobId160 {161 get162 {163 return this.ParentJobIdField;164 }165 set166 {167 if ((this.ParentJobIdField.Equals(value) != true))168 {169 this.ParentJobIdField = value;170 this.RaisePropertyChanged("ParentJobId");171 }172 }173 }174 175 [System.Runtime.Serialization.DataMemberAttribute()]176 public HeuristicLab.Clients.Hive.JobState State177 {178 get179 {180 return this.StateField;181 }182 set183 {184 if ((this.StateField.Equals(value) != true))185 {186 this.StateField = value;187 this.RaisePropertyChanged("State");188 }189 }190 }191 192 [System.Runtime.Serialization.DataMemberAttribute()]193 public System.Collections.Generic.List<HeuristicLab.Clients.Hive.StateLog> StateLog194 {195 get196 {197 return this.StateLogField;198 }199 set200 {201 if ((object.ReferenceEquals(this.StateLogField, value) != true))202 {203 this.StateLogField = value;204 this.RaisePropertyChanged("StateLog");205 }206 }207 }208 }209 210 [System.Diagnostics.DebuggerStepThroughAttribute()]211 [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]212 271 [System.Runtime.Serialization.DataContractAttribute(Name="StateLog", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.Common.DataTra" + 213 272 "nsfer")] … … 339 398 [System.Diagnostics.DebuggerStepThroughAttribute()] 340 399 [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] 341 [System.Runtime.Serialization.DataContractAttribute(Name=" Job", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.Common.DataTra" +400 [System.Runtime.Serialization.DataContractAttribute(Name="Appointment", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.Common.DataTra" + 342 401 "nsfer")] 343 402 [System.SerializableAttribute()] 344 public partial class Job : HeuristicLab.Clients.Hive.LightweightJob403 public partial class Appointment : HeuristicLab.Clients.Hive.HiveItem 345 404 { 346 405 347 406 [System.Runtime.Serialization.OptionalFieldAttribute()] 348 private int CoresNeededField; 349 350 [System.Runtime.Serialization.OptionalFieldAttribute()] 351 private bool FinishWhenChildJobsFinishedField; 352 353 [System.Runtime.Serialization.OptionalFieldAttribute()] 354 private System.Guid HiveExperimentIdField; 355 356 [System.Runtime.Serialization.OptionalFieldAttribute()] 357 private bool IsParentJobField; 358 359 [System.Runtime.Serialization.OptionalFieldAttribute()] 360 private bool IsPrivilegedField; 361 362 [System.Runtime.Serialization.OptionalFieldAttribute()] 363 private System.Nullable<System.DateTime> LastHeartbeatField; 364 365 [System.Runtime.Serialization.OptionalFieldAttribute()] 366 private int MemoryNeededField; 367 368 [System.Runtime.Serialization.OptionalFieldAttribute()] 369 private System.Collections.Generic.List<System.Guid> PluginsNeededIdsField; 370 371 [System.Runtime.Serialization.OptionalFieldAttribute()] 372 private int PriorityField; 373 374 [System.Runtime.Serialization.DataMemberAttribute()] 375 public int CoresNeeded 376 { 377 get 378 { 379 return this.CoresNeededField; 380 } 381 set 382 { 383 if ((this.CoresNeededField.Equals(value) != true)) 384 { 385 this.CoresNeededField = value; 386 this.RaisePropertyChanged("CoresNeeded"); 387 } 388 } 389 } 390 391 [System.Runtime.Serialization.DataMemberAttribute()] 392 public bool FinishWhenChildJobsFinished 393 { 394 get 395 { 396 return this.FinishWhenChildJobsFinishedField; 397 } 398 set 399 { 400 if ((this.FinishWhenChildJobsFinishedField.Equals(value) != true)) 401 { 402 this.FinishWhenChildJobsFinishedField = value; 403 this.RaisePropertyChanged("FinishWhenChildJobsFinished"); 404 } 405 } 406 } 407 408 [System.Runtime.Serialization.DataMemberAttribute()] 409 public System.Guid HiveExperimentId 410 { 411 get 412 { 413 return this.HiveExperimentIdField; 414 } 415 set 416 { 417 if ((this.HiveExperimentIdField.Equals(value) != true)) 418 { 419 this.HiveExperimentIdField = value; 420 this.RaisePropertyChanged("HiveExperimentId"); 421 } 422 } 423 } 424 425 [System.Runtime.Serialization.DataMemberAttribute()] 426 public bool IsParentJob 427 { 428 get 429 { 430 return this.IsParentJobField; 431 } 432 set 433 { 434 if ((this.IsParentJobField.Equals(value) != true)) 435 { 436 this.IsParentJobField = value; 437 this.RaisePropertyChanged("IsParentJob"); 438 } 439 } 440 } 441 442 [System.Runtime.Serialization.DataMemberAttribute()] 443 public bool IsPrivileged 444 { 445 get 446 { 447 return this.IsPrivilegedField; 448 } 449 set 450 { 451 if ((this.IsPrivilegedField.Equals(value) != true)) 452 { 453 this.IsPrivilegedField = value; 454 this.RaisePropertyChanged("IsPrivileged"); 455 } 456 } 457 } 458 459 [System.Runtime.Serialization.DataMemberAttribute()] 460 public System.Nullable<System.DateTime> LastHeartbeat 461 { 462 get 463 { 464 return this.LastHeartbeatField; 465 } 466 set 467 { 468 if ((this.LastHeartbeatField.Equals(value) != true)) 469 { 470 this.LastHeartbeatField = value; 471 this.RaisePropertyChanged("LastHeartbeat"); 472 } 473 } 474 } 475 476 [System.Runtime.Serialization.DataMemberAttribute()] 477 public int MemoryNeeded 478 { 479 get 480 { 481 return this.MemoryNeededField; 482 } 483 set 484 { 485 if ((this.MemoryNeededField.Equals(value) != true)) 486 { 487 this.MemoryNeededField = value; 488 this.RaisePropertyChanged("MemoryNeeded"); 489 } 490 } 491 } 492 493 [System.Runtime.Serialization.DataMemberAttribute()] 494 public System.Collections.Generic.List<System.Guid> PluginsNeededIds 495 { 496 get 497 { 498 return this.PluginsNeededIdsField; 499 } 500 set 501 { 502 if ((object.ReferenceEquals(this.PluginsNeededIdsField, value) != true)) 503 { 504 this.PluginsNeededIdsField = value; 505 this.RaisePropertyChanged("PluginsNeededIds"); 506 } 507 } 508 } 509 510 [System.Runtime.Serialization.DataMemberAttribute()] 511 public int Priority 512 { 513 get 514 { 515 return this.PriorityField; 516 } 517 set 518 { 519 if ((this.PriorityField.Equals(value) != true)) 520 { 521 this.PriorityField = value; 522 this.RaisePropertyChanged("Priority"); 407 private bool AllDayEventField; 408 409 [System.Runtime.Serialization.OptionalFieldAttribute()] 410 private System.DateTime EndDateField; 411 412 [System.Runtime.Serialization.OptionalFieldAttribute()] 413 private bool RecurringField; 414 415 [System.Runtime.Serialization.OptionalFieldAttribute()] 416 private System.Guid RecurringIdField; 417 418 [System.Runtime.Serialization.OptionalFieldAttribute()] 419 private System.Guid ResourceIdField; 420 421 [System.Runtime.Serialization.OptionalFieldAttribute()] 422 private System.DateTime StartDateField; 423 424 [System.Runtime.Serialization.DataMemberAttribute()] 425 public bool AllDayEvent 426 { 427 get 428 { 429 return this.AllDayEventField; 430 } 431 set 432 { 433 if ((this.AllDayEventField.Equals(value) != true)) 434 { 435 this.AllDayEventField = value; 436 this.RaisePropertyChanged("AllDayEvent"); 437 } 438 } 439 } 440 441 [System.Runtime.Serialization.DataMemberAttribute()] 442 public System.DateTime EndDate 443 { 444 get 445 { 446 return this.EndDateField; 447 } 448 set 449 { 450 if ((this.EndDateField.Equals(value) != true)) 451 { 452 this.EndDateField = value; 453 this.RaisePropertyChanged("EndDate"); 454 } 455 } 456 } 457 458 [System.Runtime.Serialization.DataMemberAttribute()] 459 public bool Recurring 460 { 461 get 462 { 463 return this.RecurringField; 464 } 465 set 466 { 467 if ((this.RecurringField.Equals(value) != true)) 468 { 469 this.RecurringField = value; 470 this.RaisePropertyChanged("Recurring"); 471 } 472 } 473 } 474 475 [System.Runtime.Serialization.DataMemberAttribute()] 476 public System.Guid RecurringId 477 { 478 get 479 { 480 return this.RecurringIdField; 481 } 482 set 483 { 484 if ((this.RecurringIdField.Equals(value) != true)) 485 { 486 this.RecurringIdField = value; 487 this.RaisePropertyChanged("RecurringId"); 488 } 489 } 490 } 491 492 [System.Runtime.Serialization.DataMemberAttribute()] 493 public System.Guid ResourceId 494 { 495 get 496 { 497 return this.ResourceIdField; 498 } 499 set 500 { 501 if ((this.ResourceIdField.Equals(value) != true)) 502 { 503 this.ResourceIdField = value; 504 this.RaisePropertyChanged("ResourceId"); 505 } 506 } 507 } 508 509 [System.Runtime.Serialization.DataMemberAttribute()] 510 public System.DateTime StartDate 511 { 512 get 513 { 514 return this.StartDateField; 515 } 516 set 517 { 518 if ((this.StartDateField.Equals(value) != true)) 519 { 520 this.StartDateField = value; 521 this.RaisePropertyChanged("StartDate"); 523 522 } 524 523 } … … 1158 1157 [System.Diagnostics.DebuggerStepThroughAttribute()] 1159 1158 [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] 1160 [System.Runtime.Serialization.DataContractAttribute(Name=" Appointment", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.Common.DataTra" +1159 [System.Runtime.Serialization.DataContractAttribute(Name="LightweightJob", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.Common.DataTra" + 1161 1160 "nsfer")] 1162 1161 [System.SerializableAttribute()] 1163 public partial class Appointment : HeuristicLab.Clients.Hive.HiveItem 1162 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Job))] 1163 public partial class LightweightJob : HeuristicLab.Clients.Hive.HiveItem 1164 1164 { 1165 1165 1166 1166 [System.Runtime.Serialization.OptionalFieldAttribute()] 1167 private bool AllDayEventField;1168 1169 [System.Runtime.Serialization.OptionalFieldAttribute()] 1170 private System. DateTime EndDateField;1171 1172 [System.Runtime.Serialization.OptionalFieldAttribute()] 1173 private bool RecurringField;1174 1175 [System.Runtime.Serialization.OptionalFieldAttribute()] 1176 private System. Guid RecurringIdField;1177 1178 [System.Runtime.Serialization.OptionalFieldAttribute()] 1179 private System.Guid ResourceIdField;1180 1181 [System.Runtime.Serialization.OptionalFieldAttribute()] 1182 private System. DateTime StartDateField;1183 1184 [System.Runtime.Serialization.DataMemberAttribute()] 1185 public bool AllDayEvent1186 { 1187 get 1188 { 1189 return this. AllDayEventField;1190 } 1191 set 1192 { 1193 if ((this. AllDayEventField.Equals(value) != true))1194 { 1195 this. AllDayEventField = value;1196 this.RaisePropertyChanged(" AllDayEvent");1197 } 1198 } 1199 } 1200 1201 [System.Runtime.Serialization.DataMemberAttribute()] 1202 public System. DateTime EndDate1203 { 1204 get 1205 { 1206 return this.E ndDateField;1207 } 1208 set 1209 { 1210 if ((this.E ndDateField.Equals(value) != true))1211 { 1212 this.E ndDateField = value;1213 this.RaisePropertyChanged("E ndDate");1214 } 1215 } 1216 } 1217 1218 [System.Runtime.Serialization.DataMemberAttribute()] 1219 public bool Recurring1220 { 1221 get 1222 { 1223 return this. RecurringField;1224 } 1225 set 1226 { 1227 if ((this. RecurringField.Equals(value) != true))1228 { 1229 this. RecurringField = value;1230 this.RaisePropertyChanged(" Recurring");1231 } 1232 } 1233 } 1234 1235 [System.Runtime.Serialization.DataMemberAttribute()] 1236 public System. Guid RecurringId1237 { 1238 get 1239 { 1240 return this. RecurringIdField;1241 } 1242 set 1243 { 1244 if ((this. RecurringIdField.Equals(value) != true))1245 { 1246 this. RecurringIdField = value;1247 this.RaisePropertyChanged(" RecurringId");1248 } 1249 } 1250 } 1251 1252 [System.Runtime.Serialization.DataMemberAttribute()] 1253 public System.Guid ResourceId1254 { 1255 get 1256 { 1257 return this. ResourceIdField;1258 } 1259 set 1260 { 1261 if ((this. ResourceIdField.Equals(value) != true))1262 { 1263 this. ResourceIdField = value;1264 this.RaisePropertyChanged(" ResourceId");1265 } 1266 } 1267 } 1268 1269 [System.Runtime.Serialization.DataMemberAttribute()] 1270 public System. DateTime StartDate1271 { 1272 get 1273 { 1274 return this.Sta rtDateField;1275 } 1276 set 1277 { 1278 if (( this.StartDateField.Equals(value) != true))1279 { 1280 this.Sta rtDateField = value;1281 this.RaisePropertyChanged("Sta rtDate");1167 private System.Nullable<HeuristicLab.Clients.Hive.Command> CommandField; 1168 1169 [System.Runtime.Serialization.OptionalFieldAttribute()] 1170 private System.TimeSpan ExecutionTimeField; 1171 1172 [System.Runtime.Serialization.OptionalFieldAttribute()] 1173 private System.DateTime LastJobDataUpdateField; 1174 1175 [System.Runtime.Serialization.OptionalFieldAttribute()] 1176 private System.Nullable<System.Guid> ParentJobIdField; 1177 1178 [System.Runtime.Serialization.OptionalFieldAttribute()] 1179 private HeuristicLab.Clients.Hive.JobState StateField; 1180 1181 [System.Runtime.Serialization.OptionalFieldAttribute()] 1182 private System.Collections.Generic.List<HeuristicLab.Clients.Hive.StateLog> StateLogField; 1183 1184 [System.Runtime.Serialization.DataMemberAttribute()] 1185 public System.Nullable<HeuristicLab.Clients.Hive.Command> Command 1186 { 1187 get 1188 { 1189 return this.CommandField; 1190 } 1191 set 1192 { 1193 if ((this.CommandField.Equals(value) != true)) 1194 { 1195 this.CommandField = value; 1196 this.RaisePropertyChanged("Command"); 1197 } 1198 } 1199 } 1200 1201 [System.Runtime.Serialization.DataMemberAttribute()] 1202 public System.TimeSpan ExecutionTime 1203 { 1204 get 1205 { 1206 return this.ExecutionTimeField; 1207 } 1208 set 1209 { 1210 if ((this.ExecutionTimeField.Equals(value) != true)) 1211 { 1212 this.ExecutionTimeField = value; 1213 this.RaisePropertyChanged("ExecutionTime"); 1214 } 1215 } 1216 } 1217 1218 [System.Runtime.Serialization.DataMemberAttribute()] 1219 public System.DateTime LastJobDataUpdate 1220 { 1221 get 1222 { 1223 return this.LastJobDataUpdateField; 1224 } 1225 set 1226 { 1227 if ((this.LastJobDataUpdateField.Equals(value) != true)) 1228 { 1229 this.LastJobDataUpdateField = value; 1230 this.RaisePropertyChanged("LastJobDataUpdate"); 1231 } 1232 } 1233 } 1234 1235 [System.Runtime.Serialization.DataMemberAttribute()] 1236 public System.Nullable<System.Guid> ParentJobId 1237 { 1238 get 1239 { 1240 return this.ParentJobIdField; 1241 } 1242 set 1243 { 1244 if ((this.ParentJobIdField.Equals(value) != true)) 1245 { 1246 this.ParentJobIdField = value; 1247 this.RaisePropertyChanged("ParentJobId"); 1248 } 1249 } 1250 } 1251 1252 [System.Runtime.Serialization.DataMemberAttribute()] 1253 public HeuristicLab.Clients.Hive.JobState State 1254 { 1255 get 1256 { 1257 return this.StateField; 1258 } 1259 set 1260 { 1261 if ((this.StateField.Equals(value) != true)) 1262 { 1263 this.StateField = value; 1264 this.RaisePropertyChanged("State"); 1265 } 1266 } 1267 } 1268 1269 [System.Runtime.Serialization.DataMemberAttribute()] 1270 public System.Collections.Generic.List<HeuristicLab.Clients.Hive.StateLog> StateLog 1271 { 1272 get 1273 { 1274 return this.StateLogField; 1275 } 1276 set 1277 { 1278 if ((object.ReferenceEquals(this.StateLogField, value) != true)) 1279 { 1280 this.StateLogField = value; 1281 this.RaisePropertyChanged("StateLog"); 1282 1282 } 1283 1283 } … … 1471 1471 1472 1472 [System.Runtime.Serialization.OptionalFieldAttribute()] 1473 private float CpuUtilizationField; 1474 1475 [System.Runtime.Serialization.OptionalFieldAttribute()] 1473 1476 private int FreeCoresField; 1474 1477 … … 1507 1510 this.AssignJobField = value; 1508 1511 this.RaisePropertyChanged("AssignJob"); 1512 } 1513 } 1514 } 1515 1516 [System.Runtime.Serialization.DataMemberAttribute()] 1517 public float CpuUtilization 1518 { 1519 get 1520 { 1521 return this.CpuUtilizationField; 1522 } 1523 set 1524 { 1525 if ((this.CpuUtilizationField.Equals(value) != true)) 1526 { 1527 this.CpuUtilizationField = value; 1528 this.RaisePropertyChanged("CpuUtilization"); 1509 1529 } 1510 1530 } … … 1772 1792 { 1773 1793 1794 [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetJobsByResourceId", ReplyAction="http://tempuri.org/IHiveService/GetJobsByResourceIdResponse")] 1795 System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetJobsByResourceId(System.Guid resourceId); 1796 1774 1797 [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/TriggerLifecycle", ReplyAction="http://tempuri.org/IHiveService/TriggerLifecycleResponse")] 1775 1798 void TriggerLifecycle(bool force); … … 1949 1972 } 1950 1973 1974 public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetJobsByResourceId(System.Guid resourceId) 1975 { 1976 return base.Channel.GetJobsByResourceId(resourceId); 1977 } 1978 1951 1979 public void TriggerLifecycle(bool force) 1952 1980 { -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/DataTransfer/Heartbeat.cs
r6004 r6269 38 38 [DataMember] 39 39 public bool AssignJob { get; set; } // if false, the server will not assign a new job 40 [DataMember] 41 public float CpuUtilization { get; set; } 40 42 41 43 public override string ToString() { -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HeartbeatManager.cs
r6110 r6269 30 30 slave.FreeCores = heartbeat.FreeCores; 31 31 slave.FreeMemory = heartbeat.FreeMemory; 32 slave.CpuUtilization = heartbeat.CpuUtilization; 32 33 slave.IsAllowedToCalculate = true; // Todo: look into calendar 33 34 slave.SlaveState = (heartbeat.JobProgress != null && heartbeat.JobProgress.Count > 0) ? SlaveState.Calculating : SlaveState.Idle;
Note: See TracChangeset
for help on using the changeset viewer.
