Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5268


Ignore:
Timestamp:
01/10/11 15:48:54 (14 years ago)
Author:
cneumuel
Message:

#1247

  • optimized memory consumption
  • increased robustness
Location:
branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive
Files:
2 edited

Legend:

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

    r5179 r5268  
    2929    ConfigMerger.exe = ConfigMerger.exe
    3030    HeuristicLab 3.3.vsmdi = HeuristicLab 3.3.vsmdi
    31     HeuristicLab.Hive 3.32.vsmdi = HeuristicLab.Hive 3.32.vsmdi
     31    HeuristicLab.Hive 3.33.vsmdi = HeuristicLab.Hive 3.33.vsmdi
    3232    LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
    3333    PreBuildEvent.cmd = PreBuildEvent.cmd
     
    108108Global
    109109  GlobalSection(TestCaseManagementSettings) = postSolution
    110     CategoryFile = HeuristicLab.Hive 3.32.vsmdi
     110    CategoryFile = HeuristicLab.Hive 3.33.vsmdi
    111111  EndGlobalSection
    112112  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  • branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.HiveEngine/3.3/HiveEngine.cs

    r5263 r5268  
    6767          coll = (OperationCollection)next;
    6868          if (coll.Parallel) {
     69            // clone the parent scope here and reuse it for each operation. otherwise for each job the whole scope-tree first needs to be copied and then cleaned, which causes a lot of work for the Garbage Collector
     70            IScope parentScopeClone = (IScope)((IAtomicOperation)coll.First()).Scope.Parent.Clone();
     71            parentScopeClone.SubScopes.Clear();
     72            parentScopeClone.ClearParentScopes();
     73
    6974            OperationJob[] jobs = new OperationJob[coll.Count];
    7075            for (int i = 0; i < coll.Count; i++) {
     
    7277            }
    7378
    74             IScope[] scopes = ExecuteOnHive(jobs, cancellationToken);
     79            IScope[] scopes = ExecuteOnHive(jobs, parentScopeClone, cancellationToken);
    7580
    7681            for (int i = 0; i < coll.Count; i++) {
     
    136141    /// </summary>
    137142    /// <param name="jobs"></param>
    138     private IScope[] ExecuteOnHive(OperationJob[] jobs, CancellationToken cancellationToken) {
     143    private IScope[] ExecuteOnHive(OperationJob[] jobs, IScope parentScopeClone, CancellationToken cancellationToken) {
    139144      LogMessage(string.Format("Executing {0} operations on the hive.", jobs.Length));
    140145      IScope[] scopes = new Scope[jobs.Length];
     
    160165
    161166          uploadTasks.Add(Task.Factory.StartNew<JobDto>((keyValuePairObj) => {
    162             return UploadJob(pluginsNeeded, keyValuePairObj, cancellationToken);
     167            return UploadJob(pluginsNeeded, keyValuePairObj, parentScopeClone, cancellationToken);
    163168          }, new KeyValuePair<int, OperationJob>(i, job), cancellationToken));
    164169        }
     
    198203
    199204          Thread.Sleep(10000);
    200           using (Disposable<IClientFacade> service = ServiceLocator.Instance.ClientFacadePool.GetService()) {
    201             results = service.Obj.GetJobResults(remainingJobIds).Obj;
    202           }
    203           var jobsFinished = results.Where(j => j.State == JobState.Finished || j.State == JobState.Failed || j.State == JobState.Aborted);
    204           finishedCount += jobsFinished.Count();
    205           var totalExecutionTime = TimeSpan.FromMilliseconds(results.Select(j => j.ExecutionTime).Union(executionTimes).Select(e => e.TotalMilliseconds).Sum());
    206           LogMessage(string.Format("Results polled. Jobs finished: {0}/{1}, TotalExecutionTime: {2}", finishedCount, jobs.Length, totalExecutionTime));
    207           foreach (var result in jobsFinished) {
    208             if (result.State == JobState.Finished) {
    209               downloadTasks.Add(Task.Factory.StartNew<OperationJob>((jobIdObj) => {
    210                 return DownloadJob(jobIndices, jobIdObj, cancellationToken);
    211               }, result.Id, cancellationToken));
    212             } else if (result.State == JobState.Aborted) {
    213               LogMessage(string.Format("Job #{0} aborted (id: {1})", jobIndices[result.Id] + 1, result.Id));
    214             } else if (result.State == JobState.Failed) {
    215               LogMessage(string.Format("Job {0} failed (id: {1}): {2}", jobIndices[result.Id] + 1, result.Id, result.Exception));
    216             }
    217             remainingJobIds.Remove(result.Id);
    218             executionTimes.Add(result.ExecutionTime);
     205          try {
     206            using (Disposable<IClientFacade> service = ServiceLocator.Instance.ClientFacadePool.GetService()) {
     207              results = service.Obj.GetJobResults(remainingJobIds).Obj;
     208            }
     209            var jobsFinished = results.Where(j => j.State == JobState.Finished || j.State == JobState.Failed || j.State == JobState.Aborted);
     210            finishedCount += jobsFinished.Count();
     211            var totalExecutionTime = TimeSpan.FromMilliseconds(results.Select(j => j.ExecutionTime).Union(executionTimes).Select(e => e.TotalMilliseconds).Sum());
     212            LogMessage(string.Format("Results polled. Jobs finished: {0}/{1}, TotalExecutionTime: {2}", finishedCount, jobs.Length, totalExecutionTime));
     213            foreach (var result in jobsFinished) {
     214              if (result.State == JobState.Finished) {
     215                downloadTasks.Add(Task.Factory.StartNew<OperationJob>((jobIdObj) => {
     216                  return DownloadJob(jobIndices, jobIdObj, cancellationToken);
     217                }, result.Id, cancellationToken));
     218              } else if (result.State == JobState.Aborted) {
     219                LogMessage(string.Format("Job #{0} aborted (id: {1})", jobIndices[result.Id] + 1, result.Id));
     220              } else if (result.State == JobState.Failed) {
     221                LogMessage(string.Format("Job {0} failed (id: {1}): {2}", jobIndices[result.Id] + 1, result.Id, result.Exception));
     222              }
     223              remainingJobIds.Remove(result.Id);
     224              executionTimes.Add(result.ExecutionTime);
     225            }
     226          }
     227          catch (Exception e) {
     228            LogException(e);
    219229          }
    220230        }
     
    254264
    255265    private static object locker = new object();
    256     private JobDto UploadJob(List<HivePluginInfoDto> pluginsNeeded, object keyValuePairObj, CancellationToken cancellationToken) {
     266    private JobDto UploadJob(List<HivePluginInfoDto> pluginsNeeded, object keyValuePairObj, IScope parentScopeClone, CancellationToken cancellationToken) {
    257267      var keyValuePair = (KeyValuePair<int, OperationJob>)keyValuePairObj;
    258268      var groups = ResourceIds.Split(';');
     
    272282      // clone operation and remove unnecessary scopes; don't do this earlier to avoid memory problems
    273283      lock (locker) {
     284        ((IAtomicOperation)keyValuePair.Value.Operation).Scope.Parent = parentScopeClone;
    274285        keyValuePair.Value.Operation = (IOperation)keyValuePair.Value.Operation.Clone();
    275286        if (keyValuePair.Value.Operation is IAtomicOperation)
Note: See TracChangeset for help on using the changeset viewer.