Changeset 6b3a37

Timestamp:

Jul 2, 2012, 7:54:12 AM (12 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:

425fc6

Parents:

6ea7f4

git-author:

Frederik Heber <heber@…> (03/04/12 22:30:57)

git-committer:

Frederik Heber <heber@…> (07/02/12 07:54:12)

Message:

Added begin(),end() for idle_queue of WorkerPool.

• this allows shutting down Workers without marking and then unmarking them as busy by FragmentScheduler.
• also the returned iterators are const and hence allow to see the which workers are idle but not to modify them this way.
• also added WorkerPool::hasBusyWorkers() to allow for waiting server shutdown until all workers have returned from work.
• added some tests for this in WorkerPoolUnitTest.

Location:

src/Fragmentation/Automation

Files:

• FragmentScheduler.cpp (modified) (1 diff)
• Pool/WorkerPool.hpp (modified) (3 diffs)
• unittests/WorkerPoolUnitTest.cpp (modified) (3 diffs)

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -516 +516 @@
   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);
+  while (pool.hasBusyWorkers())
+    ;
+
   // give all workers shutdown signal
-  while (pool.presentIdleWorkers()) {
-    const WorkerAddress address = pool.getNextIdleWorker();
-    pool.unmarkWorkerBusy(address);
+  for (WorkerPool::Idle_Queue_t::const_iterator iter = pool.begin_idle(); iter != pool.end_idle(); ++iter) {
+    const WorkerAddress address = iter->second;
     shutdownWorker(address);
-    pool.removeWorker(address);
-  }
+  }
+  pool.removeAllWorkers();
 }
 

src/Fragmentation/Automation/Pool/WorkerPool.hpp

@@ -23 +23 @@
 
 class FragmentQueue;
+class FragmentScheduler;
 class WorkerPoolTest;
 
@@ -63 +64 @@
   typedef std::multimap<priority_t, WorkerAddress> Idle_Queue_t;
 
+  // constant iterators on idle queue contents
+  Idle_Queue_t::const_iterator begin_idle() const {
+    return idle_queue.begin();
+  }
+  Idle_Queue_t::const_iterator end_idle() const {
+    return idle_queue.end();
+  }
+
   Idle_Queue_t::iterator getIdleWorker(const WorkerAddress &address);
   void markWorkerBusy(Idle_Queue_t::iterator &iter);
+
+  bool hasBusyWorkers() const {
+    return (busy_queue.size() != 0);
+  }
 
 private:
@@ -74 +87 @@
 
 private:
+  //!> FragmentScheduler needs access to removeAllWorkers()
+  friend class FragmentScheduler;
   void removeAllWorkers();
 

src/Fragmentation/Automation/unittests/WorkerPoolUnitTest.cpp

@@ -81 +81 @@
 
   // add worker
+  CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->idle_queue.size() );
+  CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->busy_queue.size() );
+  CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->pool.size() );
+  CPPUNIT_ASSERT ( pool->begin_idle() == pool->end_idle() );
   CPPUNIT_ASSERT( pool->addWorker(address) );
   CPPUNIT_ASSERT_EQUAL( (size_t)1, pool->idle_queue.size() );
   CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->busy_queue.size() );
   CPPUNIT_ASSERT_EQUAL( (size_t)1, pool->pool.size() );
+  CPPUNIT_ASSERT ( pool->begin_idle() != pool->end_idle() );
+  CPPUNIT_ASSERT_EQUAL( address, pool->begin_idle()->second );
   CPPUNIT_ASSERT( addobserver->wasNotified );
   CPPUNIT_ASSERT( !removeobserver->wasNotified );
@@ -122 +128 @@
   // check that not busy
   CPPUNIT_ASSERT( !pool->isWorkerBusy(address) );
+  CPPUNIT_ASSERT( !pool->hasBusyWorkers() );
   CPPUNIT_ASSERT_EQUAL( (size_t)1, pool->idle_queue.size() );
   CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->busy_queue.size() );
@@ -134 +141 @@
   pool->unmarkWorkerBusy(address);
   CPPUNIT_ASSERT( !pool->isWorkerBusy(address) );
+  CPPUNIT_ASSERT( !pool->hasBusyWorkers() );
   CPPUNIT_ASSERT_EQUAL( (size_t)1, pool->idle_queue.size() );
   CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->busy_queue.size() );