Changeset 8acd85 for src/Fragmentation/Automation/Pool

Timestamp:

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

6ea7f4

Parents:

1cfd17

git-author:

Frederik Heber <heber@…> (03/04/12 23:41:43)

git-committer:

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

Message:

Added PoolWorker::shutdown().

• overloaded shutdown(int) with shutdown() and the former is now just a wrapper to shutdown() that additionally calls removeme().
• PoolWorker branches on id of received job, if it's JobId::NoJob, we shutdown.

Location:

src/Fragmentation/Automation/Pool

Files:

• PoolWorker.cpp (modified) (3 diffs)
• PoolWorker.hpp (modified) (1 diff)

src/Fragmentation/Automation/Pool/PoolWorker.cpp

@@ -115 +115 @@
   if (!e)
   {
-    LOG(1, "INFO: Received job " << job->getId() << ".");
-    callback.WorkOnJob(job);
+    if (job->getId() != JobId::NoJob) {
+      LOG(1, "INFO: Working on job " << job->getId() << ".");
+      callback.WorkOnJob(job);
+    } else {
+      LOG(1, "INFO: Received NoJob.");
+      callback.shutdown();
+    }
   }
   else
@@ -144 +149 @@
 }
 
-/** Helper function to shutdown the worker properly.
+/** Wrapper function to allow use as signal handler.
  *
- * Note that we will use ShutdownWorkerOperation to unlist from server's pool.
+ * We remove us from server's pool and then just call \sa PoolWorker::shutdown().
  *
+ * @param sig signal received
  */
 void PoolWorker::shutdown(int sig)
@@ -156 +162 @@
   removeme();
 
+  shutdown();
+}
+
+/** Helper function to shutdown the worker properly.
+ *
+ * Note that we will use ShutdownWorkerOperation to unlist from server's pool.
+ */
+void PoolWorker::shutdown()
+{
   // somehow stop listener
   PoolListener.closeSocket();

src/Fragmentation/Automation/Pool/PoolWorker.hpp

@@ -53 +53 @@
   void removeFromPool();
   void shutdown(int sig);
+  void shutdown();
 
   class PoolListener_t : public Listener