Changeset 6ea7f4 for src/Fragmentation

Timestamp:

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

6b3a37

Parents:

8acd85

git-author:

Frederik Heber <heber@…> (03/04/12 23:42:50)

git-committer:

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

Message:

Changed FragmentScheduler::removeAllWorkers() by ShutdownWorkerOperation.

• so far, we have to unmark workers busy after getting them via getNextIdle..()
• FragmentScheduler does now not remove PoolWorkers after a single job.

Location:

src/Fragmentation/Automation

Files:

• FragmentScheduler.cpp (modified) (4 diffs)
• FragmentScheduler.hpp (modified) (2 diffs)

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -43 +43 @@
 #include "FragmentScheduler.hpp"
 
-FragmentJob::ptr FragmentScheduler::NoJob(new SystemCommandJob(std::string(""), std::string(""), JobId::NoJob));
-
 /** Helper function to enforce binding of FragmentWorker to possible derived
  * FragmentJob classes.
@@ -69 +67 @@
         boost::bind(&FragmentScheduler::shutdown, boost::ref(*this))),
     connection(_io_service),
-    sendJobOp(connection)
+    sendJobOp(connection),
+    shutdownWorkerOp(connection)
 {
   Info info(__FUNCTION__);
@@ -504 +503 @@
 void FragmentScheduler::shutdownWorker(const WorkerAddress &address)
 {
-  LOG(3, "DEBUG: Shutting down worker " << address << "...");
-  sendJobToWorker(address, NoJob);
+  ASSERT( !pool.isWorkerBusy(address),
+      "FragmentScheduler::sendJobToWorker() - Worker "+toString(address)+" is already busy.");
+  LOG(2, "INFO: Shutting down worker " << address << "...");
+  shutdownWorkerOp(address.host, address.service);
 }
 
@@ -518 +519 @@
   while (pool.presentIdleWorkers()) {
     const WorkerAddress address = pool.getNextIdleWorker();
+    pool.unmarkWorkerBusy(address);
     shutdownWorker(address);
+    pool.removeWorker(address);
   }
 }

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -22 +22 @@
 #include "ControllerChoices.hpp"
 #include "Controller/Commands/SendJobToWorkerOperation.hpp"
+#include "Controller/Commands/ShutdownWorkerOperation.hpp""
 #include "ControllerChoices.hpp"
 #include "FragmentQueue.hpp"
@@ -209 +210 @@
   //!> internal operation to send jobs to workers
   mutable SendJobToWorkerOperation sendJobOp;
+
+  //!> internal operation to shutdown a worker
+  ShutdownWorkerOperation shutdownWorkerOp;
 };