Changeset 74459a

Timestamp:

May 20, 2014, 9:14:56 AM (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:

caece4

Parents:

415ddd

git-author:

Frederik Heber <heber@…> (02/19/14 19:35:28)

git-committer:

Frederik Heber <heber@…> (05/20/14 09:14:56)

Message:

Added --disable-action-thread to allow disabling of extra run thread.

• this removes all functionality related to having ActionQueue::run() executed in a distinct thread.
• the extra thread is currently disabled by default as probably some stuff in QtGUI will be broken (bonds disappearing while being drawn ...)

Files:

• configure.ac (modified) (1 diff)
• src/Actions/ActionQueue.cpp (modified) (8 diffs)
• src/Actions/ActionQueue.hpp (modified) (7 diffs)
• src/Actions/MakroAction.cpp (modified) (1 diff)
• src/Python/wait.cpp (modified) (1 diff)
• src/builder.cpp (modified) (1 diff)
• src/cleanUp.cpp (modified) (3 diffs)
• src/cleanUp.hpp (modified) (1 diff)

configure.ac

@@ -40 +40 @@
 AM_CONDITIONAL([CONDPYTHON], [test x"$enable_python" != x"no"])
 AC_SUBST(HAVE_PYTHON)
+
+dnl Check whether no extra thread for ActionQueue shall be used
+AC_MSG_CHECKING(whether to enable ActionQueue's run thread)
+AC_ARG_ENABLE(
+        [action_thread],
+        AS_HELP_STRING([--enable-action-thread],[turn on extra run thread for ActionQueue [default=yes]]),
+        enable_action_thread=$enableval,
+        enable_action_thread="no"
+)
+AC_MSG_RESULT($enable_action_thread)
+AS_IF([test x"$enable_action_thread" != x"no"],[
+  AC_DEFINE(HAVE_ACTION_THREAD,1, ["Have extra run thread for ActionQueue."])
+])
+AM_CONDITIONAL([CONDACTIONTHREAD], [test x"$enable_action_thread" != x"no"])
+AC_SUBST(HAVE_ACTION_THREAD)
 
 dnl Check if we have enable qtgui

src/Actions/ActionQueue.cpp

@@ -58 +58 @@
     AR(new ActionRegistry()),
     history(new ActionHistory),
+#ifndef HAVE_ACTION_THREAD
+    CurrentAction(0)
+#else
     CurrentAction(0),
     run_thread(boost::bind(&ActionQueue::run, this)),
     run_thread_isIdle(true)
+#endif
 {}
 
 ActionQueue::~ActionQueue()
 {
+#ifdef HAVE_ACTION_THREAD
   stop();
+#endif
 
   // free all actions contained in actionqueue
@@ -86 +92 @@
   Action *newaction = _action->clone(state);
   newaction->prepare(state);
+#ifdef HAVE_ACTION_THREAD
   mtx_queue.lock();
+#endif
   actionqueue.push_back( newaction );
+#ifndef HAVE_ACTION_THREAD
+  try {
+    newaction->call();
+  } catch(ActionFailureException &e) {
+    std::cerr << "Action " << *boost::get_error_info<ActionNameString>(e) << " has failed." << std::endl;
+    World::getInstance().setExitFlag(5);
+  }
+#else
   {
     boost::lock_guard<boost::mutex> lock(mtx_idle);
@@ -93 +109 @@
   }
   mtx_queue.unlock();
+#endif
 }
 
 void ActionQueue::insertAction(Action *_action, enum Action::QueryOptions state)
 {
+#ifndef HAVE_ACTION_THREAD
+  queueAction(_action, state);
+#else
   Action *newaction = _action->clone(state);
   newaction->prepare(state);
@@ -106 +126 @@
   }
   mtx_queue.unlock();
-}
-
+#endif
+}
+
+#ifdef HAVE_ACTION_THREAD
 void ActionQueue::run()
 {
@@ -157 +179 @@
   } while (!Interrupted);
 }
+#endif
 
 void ActionQueue::insertTempQueue()
@@ -168 +191 @@
 }
 
+#ifdef HAVE_ACTION_THREAD
 void ActionQueue::wait()
 {
@@ -176 +200 @@
   }
 }
-
+#endif
+
+#ifdef HAVE_ACTION_THREAD
 void ActionQueue::stop()
 {
@@ -184 +210 @@
   run_thread.join();
 }
+#endif
 
 Action* ActionQueue::getActionByName(const std::string &name)

src/Actions/ActionQueue.hpp

@@ -16 +16 @@
 #include "CodePatterns/Singleton.hpp"
 
+
+#ifdef HAVE_ACTION_THREAD
 #include <boost/thread.hpp>
+#endif
 #include <vector>
 
@@ -22 +25 @@
 #include "Actions/ActionState.hpp"
 
+#ifdef HAVE_ACTION_THREAD
 void stopQueue();
 void waitQueue();
+#endif
 
 namespace MoleCuilder {
@@ -117 +122 @@
   void redoLast();
 
+#ifdef HAVE_ACTION_THREAD
   boost::thread &getRunThread()
   { return run_thread; }
+#endif
 
 private:
@@ -136 +143 @@
   void clear();
 
+#ifdef HAVE_ACTION_THREAD
   /** Runs the ActionQueue.
    *
@@ -154 +162 @@
    */
   void wait();
+#endif
 
   /** Insert an action after CurrentAction.
@@ -196 +205 @@
   ActionQueue_t tempqueue;
 
+#ifdef HAVE_ACTION_THREAD
   //!> internal thread to call Actions
   boost::thread run_thread;
@@ -210 +220 @@
   //!> internal mutex to synchronize access to run_thread_isIdle
   boost::mutex mtx_idle;
+#endif
 };
 

src/Actions/MakroAction.cpp

@@ -89 +89 @@
 bool MakroAction::removeAction(const std::string &name)
 {
-  actions.removeAction(name);
+  return actions.removeAction(name);
 }
 

src/Python/wait.cpp

@@ -45 +45 @@
 {
   // prevent wait() in python scripts in case of present UI (loaded sessions)
+#ifdef HAVE_ACTION_THREAD
   if (!UIFactory::isFactoryPresent()) {
     LOG(0, "Waiting for action queue to idle.");
     waitQueue();
   }
+#endif
 }

src/builder.cpp

@@ -49 +49 @@
   doUI();
 
+#ifdef HAVE_ACTION_THREAD
   waitQueue();
   stopQueue();
+#endif
   if (UIFactory::getInstance().getUIName() == "CommandLine")
     return saveAll();

src/cleanUp.cpp

@@ -114 +114 @@
 void stopAndPurgeQueue()
 {
+#ifdef HAVE_ACTION_THREAD
   // adding a wait here such that ActionQueue's run_thread is done any may stop
   waitQueue();
+#endif
   MoleCuilder::ActionQueue::purgeInstance();
   MoleCuilder::OptionRegistry::purgeInstance();
@@ -218 +220 @@
 }
 
+#ifdef HAVE_ACTION_THREAD
 /** Stops the queue such that all Actions are done.
  *
@@ -233 +236 @@
   MoleCuilder::ActionQueue::getInstance().wait();
 }
+#endif

src/cleanUp.hpp

@@ -19 +19 @@
 void purgeStaticInstances();
 int saveAll();
+#ifdef HAVE_ACTION_THREAD
 void stopQueue();
 void waitQueue();
+#endif
 
 #endif /* CLEANUP_HPP_ */