Changeset 5132


Ignore:
Timestamp:
12/20/10 10:11:09 (10 years ago)
Author:
cneumuel
Message:

#1260

  • added Prepare() after a job finished on slave to delete unnecessary executioncontexts and scopes
Location:
branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

    r5093 r5132  
    2929    ConfigMerger.exe = ConfigMerger.exe
    3030    HeuristicLab 3.3.vsmdi = HeuristicLab 3.3.vsmdi
     31    HeuristicLab.Hive 3.31.vsmdi = HeuristicLab.Hive 3.31.vsmdi
    3132    LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
    3233    PreBuildEvent.cmd = PreBuildEvent.cmd
     
    7576Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Slave.ExecutionEngine-3.3", "HeuristicLab.Hive.Slave.ExecutionEngine\3.3\HeuristicLab.Hive.Slave.ExecutionEngine-3.3.csproj", "{1605256A-1CB3-44AB-AAFF-577093EE5789}"
    7677EndProject
    77 Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Hive-3.3", "HiveWeb\Hive-3.3\", "{590AD383-846B-48FF-8D06-B0AA1B328102}"
     78Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Hive-3.3", "HiveWeb\Hive-3.3", "{590AD383-846B-48FF-8D06-B0AA1B328102}"
    7879  ProjectSection(WebsiteProperties) = preProject
    7980    TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
     
    101102EndProject
    102103Global
     104  GlobalSection(TestCaseManagementSettings) = postSolution
     105    CategoryFile = HeuristicLab.Hive 3.31.vsmdi
     106  EndGlobalSection
    103107  GlobalSection(SolutionConfigurationPlatforms) = preSolution
    104108    Debug|Any CPU = Debug|Any CPU
  • branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/Jobs/OptimizerJob.cs

    r4760 r5132  
    167167    public event EventHandler JobStopped;
    168168    protected virtual void OnJobStopped() {
     169      optimizer.Prepare(); // nuke executioncontext and scopes to reduce memory footprint
    169170      EventHandler handler = JobStopped;
    170171      if (handler != null) handler(this, EventArgs.Empty);
  • branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs

    r5093 r5132  
    3131  internal class DefaultScheduler : IScheduler {
    3232
    33     private static object jobLock = new object();
     33    public static object locker = new object();
    3434
    3535    #region IScheduler Members
     
    4444
    4545    public JobDto GetNextJobForSlave(Guid slaveId) {
    46       lock (jobLock) {
     46      lock (locker) {
    4747        /// Critical section ///
    4848        JobDto jobToCalculate = null;
  • branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveCommunicator.cs

    r5093 r5132  
    234234        using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
    235235          SlaveDto slave = UpdateSlaveData(heartbeatData);
    236           DaoLocator.SlaveDao.Update(slave);
    237 
     236          lock (DefaultScheduler.locker) {
     237            DaoLocator.SlaveDao.Update(slave);
     238          }
    238239          SaveTimestamp(heartbeatData);
    239240
  • branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLab.Hive.Slave.Communication-3.3.csproj

    r5093 r5132  
    111111  </ItemGroup>
    112112  <ItemGroup>
    113     <None Include="app.config" />
     113    <None Include="app.config">
     114      <SubType>Designer</SubType>
     115    </None>
    114116    <None Include="f005pc.hagenberg.fhooe.at - app.config">
    115117      <SubType>Designer</SubType>
Note: See TracChangeset for help on using the changeset viewer.