Changeset bff93d for src/Fragmentation/Automation/Pool

Timestamp:

Jul 2, 2012, 8:32:09 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:

122de0

Parents:

d57585

git-author:

Frederik Heber <heber@…> (05/11/12 20:00:28)

git-committer:

Frederik Heber <heber@…> (07/02/12 08:32:09)

Message:

RemoveFromPoolOperation is now async.

• changed PoolWorker such that we close down socket and listener via success callback handler of the operartion.
• FragmentScheduler now sends true/false as status of removal.

Location:

src/Fragmentation/Automation/Pool

Files:

• PoolWorker.cpp (modified) (5 diffs)
• PoolWorker.hpp (modified) (2 diffs)

src/Fragmentation/Automation/Pool/PoolWorker.cpp

@@ -69 +69 @@
   connection_(_io_service),
   failed(boost::bind(&ExitflagContainer::setExitflag, this, ExitflagContainer::ErrorFlag)),
+  closingdown(boost::bind(&PoolWorker::finish, this)),
   enrollOp(connection_, address, AsyncOperation::NoOpCallback, failed),
   submitOp(connection_, address, AsyncOperation::NoOpCallback, failed),
@@ -74 +75 @@
       boost::ref(submitOp),
       _host, _service)),
-  removeOp(connection_, address),
-  removeme(boost::bind(&SyncOperation::operator(),
+  removeOp(connection_, address, closingdown, failed),
+  removeme(boost::bind(&AsyncOperation::operator(),
       boost::ref(removeOp),
       _host, _service))
@@ -168 +169 @@
  *
  * Note that we will use ShutdownWorkerOperation to unlist from server's pool.
+ * We stop the io_service via its callback handler in case of success.
  */
 void PoolWorker::shutdown()
@@ -173 +175 @@
   // remove us from pool
   removeme();
+}
 
+/** Helper function to close down listener and stop service.
+ *
+ * This is called after we have been removed from server's pool
+ *
+ */
+void PoolWorker::finish()
+{
   // somehow stop listener
   PoolListener.closeSocket();
@@ -180 +190 @@
   io_service.stop();
 }
+

src/Fragmentation/Automation/Pool/PoolWorker.hpp

@@ -59 +59 @@
   void shutdown(int sig);
   void shutdown();
+  void finish();
 
   class PoolListener_t : public Listener
@@ -103 +104 @@
   boost::function<void ()> failed;
 
+  //!> internally bound function that sets the Exitflag to ErrorFlag
+  const boost::function<void ()> closingdown;
+
   //!> operation that handles obtaining a job
   EnrollInPoolOperation enrollOp;