Changeset befcf8 for src/Fragmentation/Automation/FragmentScheduler.cpp

Timestamp:

Jul 2, 2012, 8:31:59 AM (13 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

b15c4f

Parents:

ba995d

git-author:

Frederik Heber <heber@…> (05/03/12 13:30:09)

git-committer:

Frederik Heber <heber@…> (07/02/12 08:31:59)

Message:

Rewrote FragmentScheduler::shutdown to make sure idle_queue is truely const.

• WorkerPool has new function to return idle_queue addresses as Vector.
• We first get all addresses, then shutdown each and also we iterate over this as long as OperationQueue has Ops and idle_queue has idlers.

File:

• src/Fragmentation/Automation/FragmentScheduler.cpp (modified) (1 diff)

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -535 +535 @@
 void FragmentScheduler::removeAllWorkers()
 {
-  LOG(2, "INFO: Shutting down workers ...");
-
-  // \todo We have to wait here until all workers are done
   // first, sign off such that no new jobs are given to workers
   pool.signOff(this, WorkerPool::WorkerIdle);
+
+  LOG(2, "DEBUG: Waiting for busy workers to finish ...");
   while (pool.hasBusyWorkers())
     ;
 
-  // give all workers shutdown signal
-  for (WorkerPool::Idle_Queue_t::const_iterator iter = pool.begin_idle(); iter != pool.end_idle(); ++iter) {
-    const WorkerAddress address = iter->second;
-    shutdownWorker(address);
-  }
-  // wait for pending shutdown operations
-  while (!OpQueue.empty());
+  LOG(2, "INFO: Shutting down workers ...");
+  // iterate until there are no more idle workers
+  do {
+    // get list of all idle workers
+    typedef std::vector<std::pair<std::string, std::string> > WorkerList_t;
+    WorkerList_t WorkerList = pool.getListOfIdleWorkers();
+
+    // give all workers shutdown signal
+    for (WorkerList_t::const_iterator iter = WorkerList.begin(); iter != WorkerList.end(); ++iter)
+      shutdownWorker(WorkerAddress(iter->first, iter->second));
+
+    // wait for pending shutdown operations
+    while (!OpQueue.empty())
+      ;
+  } while (pool.presentIdleWorkers());
   pool.removeAllWorkers();
 }