Changeset cfb9c5 for src

Timestamp:

Oct 19, 2014, 5:13:09 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:

cead3f

Parents:

1b6cec

git-author:

Frederik Heber <heber@…> (09/23/14 16:14:18)

git-committer:

Frederik Heber <heber@…> (10/19/14 17:13:09)

Message:

FIX: Setting ActionQueue::_lastchangedaction without heeding whether Action failed is bad.

• causes segfault when notification informs about change and _lastchangeaction is still NULL (as the very first Action failed).
• we now only notify when action succeeded.

File:

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

src/Actions/ActionQueue.cpp ¶

@@ -98 +98 @@
 void ActionQueue::queueAction(const Action * const _action, enum Action::QueryOptions state)
 {
-  OBSERVE;
-  NOTIFY(ActionQueued);
   Action *newaction = _action->clone(state);
   newaction->prepare(state);
@@ -123 +121 @@
     std::cerr << "ActionQueue cleared." << std::endl;
   }
+  if (lastActionOk) {
+    OBSERVE;
+    NOTIFY(ActionQueued);
+    _lastchangedaction = newaction;
+  }
 #else
   {
@@ -130 +133 @@
   mtx_queue.unlock();
 #endif
-  _lastchangedaction = newaction;
 }
 
@@ -193 +195 @@
         CurrentAction = (size_t)-1;
       }
+      if (lastActionOk) {
+        OBSERVE;
+        NOTIFY(ActionQueued);
+        _lastchangedaction = actionqueue[CurrentAction];
+      }
       // access actionqueue, hence using mutex
       mtx_queue.lock();