Changeset a87d1e2 for src/Actions/ActionQueue.cpp

Timestamp:

Jul 25, 2015, 1:02:12 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:

9a4880

Parents:

9ec4b8

git-author:

Frederik Heber <heber@…> (06/18/15 00:56:26)

git-committer:

Frederik Heber <heber@…> (07/25/15 13:02:12)

Message:

FIX: ActionQueue::isIdle() states whether actions are executed or not.

• QtUIFactory uses this to wait till test running next action.

File:

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

src/Actions/ActionQueue.cpp

@@ -63 +63 @@
     history(new ActionHistory),
     lastActionOk(true),
-#ifdef HAVE_ACTION_THREAD
     CurrentAction(0),
+#ifdef HAVE_ACTION_THREAD
     run_thread(boost::bind(&ActionQueue::run, this)),
     run_thread_isIdle(true),
@@ -108 +108 @@
 #ifndef HAVE_ACTION_THREAD
   try {
-    if (!isDryRun(newaction))
+    if (!isDryRun(newaction)) {
+      CurrentAction = actionqueue.size()-1;
       newaction->call();
+      CurrentAction = actionqueue.size();
+    }
     lastActionOk = true;
   } catch(ActionFailureException &e) {
@@ -130 +133 @@
   }
 #else
-  setRunThreadIdle(CurrentAction == actionqueue.size());
   mtx_queue.unlock();
+  setRunThreadIdle(isIdle());
 #endif
 }
@@ -144 +147 @@
   mtx_queue.lock();
   tempqueue.push_back( newaction );
-  setRunThreadIdle( !((CurrentAction != actionqueue.size()) || !tempqueue.empty()) );
+  const bool tempqueue_notempty = !tempqueue.empty();
   mtx_queue.unlock();
-#endif
+  setRunThreadIdle( !((!isIdle()) || tempqueue_notempty) );
+#endif
+}
+
+bool ActionQueue::isIdle() const
+{
+#ifdef HAVE_ACTION_THREAD
+  boost::unique_lock<boost::mutex> lock(mtx_queue);
+#endif
+  bool status = (CurrentAction == actionqueue.size());
+  return status;
 }
 
@@ -169 +182 @@
     mtx_queue.lock();
     insertTempQueue();
-    bool status = (CurrentAction != actionqueue.size());
     mtx_queue.unlock();
+    bool status = !isIdle();
     while (status) {
       //      boost::this_thread::disable_interruption di;
@@ -208 +221 @@
       // while an action instance is "in-use"
       insertTempQueue();
-      status = (CurrentAction != actionqueue.size());
       mtx_queue.unlock();
+      status = !isIdle();
     }
-    setRunThreadIdle( !((CurrentAction != actionqueue.size()) || !tempqueue.empty()) );
+    mtx_queue.lock();
+    const bool tempqueue_notempty = !tempqueue.empty();
+    mtx_queue.unlock();
+    setRunThreadIdle( !((!isIdle()) || tempqueue_notempty) );
     cond_idle.notify_one();
 //    LOG(1, "DEBUG: End of ActionQueue's run() loop.");