Changeset b73545 for src/Actions/ActionQueue.cpp

Timestamp:

Sep 15, 2014, 2:28:50 PM (10 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:

7f1b51

Parents:

55736b (diff), 5524ae9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'MemFixes' into stable

Conflicts:

src/Tesselation/boundary.cpp

• Lots of functions removed in boundary.cpp in Cleanup_old_code but seemingly also affected during MemFixes.

File:

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

src/Actions/ActionQueue.cpp

@@ -74 +74 @@
 #endif
 
-  // free all actions contained in actionqueue
-  for (ActionQueue_t::iterator iter = actionqueue.begin(); !actionqueue.empty(); iter = actionqueue.begin()) {
-    delete *iter;
-    actionqueue.erase(iter);
-  }
+  clearQueue();
 
   delete history;
@@ -86 +82 @@
 void ActionQueue::queueAction(const std::string &name, enum Action::QueryOptions state)
 {
-  queueAction(AR->getActionByName(name), state);
-}
-
-void ActionQueue::queueAction(Action *_action, enum Action::QueryOptions state)
+  const Action * const registryaction = AR->getActionByName(name);
+  queueAction(registryaction, state);
+}
+
+void ActionQueue::queueAction(const Action * const _action, enum Action::QueryOptions state)
 {
   Action *newaction = _action->clone(state);
@@ -104 +101 @@
     std::cerr << "Action " << *boost::get_error_info<ActionNameString>(e) << " has failed." << std::endl;
     World::getInstance().setExitFlag(5);
-    actionqueue.clear();
-    tempqueue.clear();
+    clearQueue();
+    lastActionOk = false;
+    std::cerr << "ActionQueue cleared." << std::endl;
+  } catch (std::exception &e) {
+    pushStatus("FAIL: General exception caught, aborting.");
+    World::getInstance().setExitFlag(134);
+    clearQueue();
     lastActionOk = false;
     std::cerr << "ActionQueue cleared." << std::endl;
@@ -167 +169 @@
         pushStatus("FAIL: Action "+*boost::get_error_info<ActionNameString>(e)+" has failed.");
         World::getInstance().setExitFlag(5);
-        actionqueue.clear();
-        tempqueue.clear();
+        clearQueue();
         lastActionOk = false;
+        std::cerr << "ActionQueue cleared." << std::endl;
+        CurrentAction = (size_t)-1;
+      } catch (std::exception &e) {
+        pushStatus("FAIL: General exception caught, aborting.");
+        World::getInstance().setExitFlag(134);
+        clearQueue();
         std::cerr << "ActionQueue cleared." << std::endl;
         CurrentAction = (size_t)-1;
@@ -289 +296 @@
 }
 
+void ActionQueue::clearQueue()
+{
+  // free all actions contained in actionqueue
+  for (ActionQueue_t::iterator iter = actionqueue.begin();
+      !actionqueue.empty(); iter = actionqueue.begin()) {
+    delete *iter;
+    actionqueue.erase(iter);
+  }
+  // free all actions contained in tempqueue
+  for (ActionQueue_t::iterator iter = tempqueue.begin();
+      !tempqueue.empty(); iter = tempqueue.begin()) {
+    delete *iter;
+    tempqueue.erase(iter);
+  }
+}
 
 const ActionQueue::ActionTokens_t ActionQueue::getListOfActions() const