Changeset d57585 for src/Fragmentation/Automation/FragmentController.cpp

Timestamp:

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

bff93d

Parents:

9db22d

git-author:

Frederik Heber <heber@…> (05/11/12 19:42:43)

git-committer:

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

Message:

Added ExitflagContainer that FragmentController and PoolWorker use.

• all Operations have been stripped of their internal Exitflag.
• PoolWorker and FragmentController uses callback mechanism to let the AsyncOperation set their Exitflag in case of failure.

File:

• src/Fragmentation/Automation/FragmentController.cpp (modified) (2 diffs)

src/Fragmentation/Automation/FragmentController.cpp

@@ -47 +47 @@
 FragmentController::FragmentController(
     boost::asio::io_service& io_service) :
-    connection_(io_service)
+    connection_(io_service),
+    failed(boost::bind(&ExitflagContainer::setExitflag, this, ExitflagContainer::ErrorFlag))
 {
   Info info(__FUNCTION__);
 
   // insert commands into registry
-  Commands.registerInstance(new CheckResultsOperation(connection_, AsyncOperation::NoOpCallback));
-  Commands.registerInstance(new GetNextJobIdOperation(connection_, AsyncOperation::NoOpCallback));
-  Commands.registerInstance(new ReceiveResultsOperation(connection_, AsyncOperation::NoOpCallback));
+  Commands.registerInstance(new CheckResultsOperation(connection_, AsyncOperation::NoOpCallback, failed));
+  Commands.registerInstance(new GetNextJobIdOperation(connection_, AsyncOperation::NoOpCallback, failed));
+  Commands.registerInstance(new ReceiveResultsOperation(connection_, AsyncOperation::NoOpCallback, failed));
   Commands.registerInstance(new RemoveAllWorkerOperation(connection_));
-  Commands.registerInstance(new SendJobsOperation(connection_, AsyncOperation::NoOpCallback));
+  Commands.registerInstance(new SendJobsOperation(connection_, AsyncOperation::NoOpCallback, failed));
   Commands.registerInstance(new ShutdownOperation(connection_));
 }
@@ -67 +68 @@
   Commands.cleanup();
 }
-
-/** Getter for Exitflag of all any Operation.
- *
- * We simply go through all of them and check which failed.
- *
- * @return Combined Exitflag of all Operations in \a Commands.
- */
-size_t FragmentController::getExitflag() const
-{
-  for (OperationRegistry::const_iterator iter = Commands.getBeginIter();
-      iter != Commands.getEndIter(); ++iter)
-    if ((iter->second)->getExitflag() != 0)
-      return (iter->second)->getExitflag();
-  return 0;
-}
-
 
 /** Requests an available id from server