Changeset 601ef8 for src/Actions/ActionQueue.hpp

Timestamp:

Jan 12, 2015, 10:10:30 PM (11 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:

2440ce

Parents:

33c97e

git-author:

Frederik Heber <heber@…> (12/14/14 19:10:19)

git-committer:

Frederik Heber <heber@…> (01/12/15 22:10:30)

Message:

FIX: ActionQueue is no longer cleared when Action fails.

• we only remove the present and all following Actions.
• also cleaned up threaded/non-threaded parts of ActionQueue: CurrentAction, tempQueue is solely used in threaded part.

File:

• src/Actions/ActionQueue.hpp (modified) (5 diffs)

src/Actions/ActionQueue.hpp

@@ -202 +202 @@
   void clear();
 
-  /** Clears all actions currently present in the actionqueues.
-   *
-   */
-  void clearQueue();
-
-#ifdef HAVE_ACTION_THREAD
+  /** Clears all actions present in the actionqueues from \a _fromAction.
+   *
+   * @param _fromAction 0 if all Actions to clear or else
+   */
+  void clearQueue(const size_t _fromAction = 0);
+
+#ifdef HAVE_ACTION_THREAD
+
+  /** Clears the temporary queue.
+   *
+   */
+  void clearTempQueue();
+
+  /** Sets the run_thread_isIdle flag.
+   *
+   * @param _flag state to set to
+   */
+  void setRunThreadIdle(const bool _flag);
+
   /** Runs the ActionQueue.
    *
@@ -226 +239 @@
    */
   void wait();
+
+  /** Moves all action from tempqueue into real queue.
+   *
+   */
+  void insertTempQueue();
+
 #endif
 
@@ -236 +255 @@
   void insertAction(Action *_action, enum Action::QueryOptions state);
 
-  /** Moves all action from tempqueue into real queue.
-   *
-   */
-  void insertTempQueue();
-
 private:
   /** Private cstor for ActionQueue.
@@ -267 +281 @@
   ActionQueue_t actionqueue;
 
+  //!> indicates that the last action has failed
+  bool lastActionOk;
+
+#ifdef HAVE_ACTION_THREAD
   //!> point to current action in actionqueue
   size_t CurrentAction;
@@ -273 +291 @@
   ActionQueue_t tempqueue;
 
-  //!> indicates that the last action has failed
-  bool lastActionOk;
-
-#ifdef HAVE_ACTION_THREAD
   //!> internal thread to call Actions
   boost::thread run_thread;