Changeset 122de0

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:

b08c7c

Parents:

bff93d

git-author:

Frederik Heber <heber@…> (05/14/12 13:57:39)

git-committer:

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

Message:

PoolWorker now shuts down when enrollment is not successful.

• new bound function initiateme contains call to initiateSocket() and is called when EnrollInPoolOperation succeeds.

Location:

src/Fragmentation/Automation/Pool

Files:

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

src/Fragmentation/Automation/Pool/PoolWorker.cpp

@@ -70 +70 @@
   failed(boost::bind(&ExitflagContainer::setExitflag, this, ExitflagContainer::ErrorFlag)),
   closingdown(boost::bind(&PoolWorker::finish, this)),
-  enrollOp(connection_, address, AsyncOperation::NoOpCallback, failed),
+  initiateme(boost::bind(&PoolListener_t::initiateSocket, boost::ref(PoolListener))),
+  enrollOp(connection_, address, initiateme, failed),
   submitOp(connection_, address, AsyncOperation::NoOpCallback, failed),
   submitresult(boost::bind(&AsyncOperation::operator(),
@@ -84 +85 @@
   // always enroll
   enrollOp(_host,_service);
-
-  // listen for server
-  PoolListener.initiateSocket();
 }
 

src/Fragmentation/Automation/Pool/PoolWorker.hpp

@@ -107 +107 @@
   const boost::function<void ()> closingdown;
 
+  //!> internally bound function initiates the PoolListener's socket
+  const boost::function<void ()> initiateme;
+
   //!> operation that handles obtaining a job
   EnrollInPoolOperation enrollOp;