Changeset ee61ce for src

Timestamp:

Jul 6, 2012, 10:18:45 AM (12 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:

cbcbbd

Parents:

865a218

git-author:

Frederik Heber <heber@…> (06/01/12 18:30:13)

git-committer:

Frederik Heber <heber@…> (07/06/12 10:18:45)

Message:

Extracted ControllerCommand and ControllerCommandRegistry from controller and placed into own modules.

• ControllerCommand encapsulates a controller command name and its deque of bound functions.
• ..Registry stores these instances.

Location:

src

Files:

• ControllerCommand.hpp (added)
• ControllerCommandRegistry.cpp (added)
• ControllerCommandRegistry.hpp (added)
• Makefile.am (modified) (1 diff)
• controller.cpp (modified) (3 diffs)

src/Makefile.am

@@ -381 +381 @@
   Fragmentation/Automation/Pool/WorkerPool.hpp
 
-Controller_SOURCES = $(CONTROLLERSOURCE) $(CONTROLLERHEADER) controller.cpp DefaultOptions.cpp DefaultOptions.hpp ControllerOptions.cpp ControllerOptions.hpp ControllerOptions_MPQCCommandJob.cpp ControllerOptions_MPQCCommandJob.hpp ControllerOptions_SystemCommandJob.cpp ControllerOptions_SystemCommandJob.hpp
+Controller_SOURCES = $(CONTROLLERSOURCE) $(CONTROLLERHEADER) controller.cpp ControllerCommand.hpp ControllerCommandRegistry.cpp ControllerCommandRegistry.hpp DefaultOptions.cpp DefaultOptions.hpp ControllerOptions.cpp ControllerOptions.hpp ControllerOptions_MPQCCommandJob.cpp ControllerOptions_MPQCCommandJob.hpp ControllerOptions_SystemCommandJob.cpp ControllerOptions_SystemCommandJob.hpp
 Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM__OPTIONS_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
 Controller_CXXFLAGS = $(AM_CPPFLAGS)

src/controller.cpp

@@ -50 +50 @@
 #include "Fragmentation/Automation/Results/FragmentResult.hpp"
 #include "ControllerOptions_MPQCCommandJob.hpp"
+#include "ControllerOptions_SystemCommandJob.hpp"
+#include "ControllerCommandRegistry.hpp"
 
 /** Print the status of scheduled and done jobs.
@@ -320 +322 @@
   boost::program_options::variables_map vm;
 
-  typedef boost::function<void ()> ControllerCommand;
-  typedef std::map<std::string, std::deque<ControllerCommand> > CommandsMap_t;
-  CommandsMap_t CommandsMap;
-
-  // prepare the command queues for each ControllerCommand
-  // note: we need "< ControllerCommand >" because parseExecutable(),... return int
+  // prepare ControllerCommand
+  // note: we need "< ControllerCommand::commands_t >" because parseExecutable(),... return int
   // in contrast to other functions that return void
-  std::deque<ControllerCommand> addjobsQueue = boost::assign::list_of< ControllerCommand >
+  ControllerCommandRegistry ControllerCommands;
+  ControllerCommands.registerInstance(new ControllerCommand("addjobs",
+      boost::assign::list_of< ControllerCommand::commands_t >
       (boost::bind(&FragmentController::requestIds,
           boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport),
           boost::bind(&std::vector<std::string>::size, boost::cref(ControllerInfo.jobfiles))))
       (boost::bind(&AddJobs, boost::ref(controller), boost::cref(ControllerInfo)))
-      ;
-  std::deque<ControllerCommand> createjobsQueue = boost::assign::list_of< ControllerCommand >
-      (boost::bind(&FragmentController::requestIds,
-          boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport), 1))
-      (boost::bind(&createJobs, boost::ref(controller), boost::cref(ControllerInfo)))
-      ;
-  std::deque<ControllerCommand> checkresultsQueue = boost::assign::list_of< ControllerCommand >
-      (boost::bind(&FragmentController::checkResults,
-          boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport)))
-      (boost::bind(&printJobStatus,
-          boost::bind(&FragmentController::getJobStatus, boost::ref(controller))))
-      ;
-  std::deque<ControllerCommand> receiveresultsQueue = boost::assign::list_of< ControllerCommand >
-      (boost::bind(&FragmentController::receiveResults,
-          boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport)))
-      (boost::bind(&printReceivedResults,
-          boost::bind(&FragmentController::getReceivedResults, boost::ref(controller))))
-      ;
-  std::deque<ControllerCommand> receivempqcresultsQueue = boost::assign::list_of< ControllerCommand >
-      (boost::bind(&FragmentController::receiveResults,
-          boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport)))
-      (boost::bind(&printReceivedMPQCResults,
-          boost::bind(&FragmentController::getReceivedResults, boost::ref(controller)),
-          boost::cref(ControllerInfo.fragmentpath),
-          boost::bind(&getNoAtomsFromAdjacencyFile, boost::cref(ControllerInfo.fragmentpath))))
-      ;
-  std::deque<ControllerCommand> removeallQueue = boost::assign::list_of< ControllerCommand >
-      (boost::bind(&FragmentController::removeall,
-          boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport)))
-      ;
-  std::deque<ControllerCommand> shutdownQueue = boost::assign::list_of< ControllerCommand >
-      (boost::bind(&FragmentController::shutdown,
-          boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport)))
-      ;
-  CommandsMap.insert( std::make_pair("addjobs", addjobsQueue) );
-  CommandsMap.insert( std::make_pair("createjobs", createjobsQueue) );
-  CommandsMap.insert( std::make_pair("checkresults", checkresultsQueue) );
-  CommandsMap.insert( std::make_pair("receiveresults", receiveresultsQueue) );
-  CommandsMap.insert( std::make_pair("receivempqc", receivempqcresultsQueue) );
-  CommandsMap.insert( std::make_pair("removeall", removeallQueue) );
-  CommandsMap.insert( std::make_pair("shutdown", shutdownQueue) );
+      ));
+  ControllerCommands.registerInstance(new ControllerCommand("createjobs",
+      boost::assign::list_of< ControllerCommand::commands_t >
+        (boost::bind(&FragmentController::requestIds,
+            boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport), 1))
+        (boost::bind(&createJobs, boost::ref(controller), boost::cref(ControllerInfo)))
+      ));
+  ControllerCommands.registerInstance(new ControllerCommand("checkresults",
+      boost::assign::list_of< ControllerCommand::commands_t >
+        (boost::bind(&FragmentController::checkResults,
+            boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport)))
+        (boost::bind(&printJobStatus,
+            boost::bind(&FragmentController::getJobStatus, boost::ref(controller))))
+      ));
+  ControllerCommands.registerInstance(new ControllerCommand("receiveresults",
+      boost::assign::list_of< ControllerCommand::commands_t >
+        (boost::bind(&FragmentController::receiveResults,
+            boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport)))
+        (boost::bind(&printReceivedResults,
+            boost::bind(&FragmentController::getReceivedResults, boost::ref(controller))))
+      ));
+  ControllerCommands.registerInstance(new ControllerCommand("receivempqc",
+      boost::assign::list_of< ControllerCommand::commands_t >
+        (boost::bind(&FragmentController::receiveResults,
+            boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport)))
+        (boost::bind(&printReceivedMPQCResults,
+            boost::bind(&FragmentController::getReceivedResults, boost::ref(controller)),
+            boost::cref(ControllerInfo.fragmentpath),
+            boost::bind(&getNoAtomsFromAdjacencyFile, boost::cref(ControllerInfo.fragmentpath))))
+      ));
+  ControllerCommands.registerInstance(new ControllerCommand("removeall",
+      boost::assign::list_of< ControllerCommand::commands_t >
+        (boost::bind(&FragmentController::removeall,
+            boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport)))
+      ));
+  ControllerCommands.registerInstance(new ControllerCommand("shutdown",
+      boost::assign::list_of< ControllerCommand::commands_t >
+        (boost::bind(&FragmentController::shutdown,
+            boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport)))
+      ));
   std::vector<std::string> Commands;
-  for (CommandsMap_t::const_iterator iter = CommandsMap.begin(); iter != CommandsMap.end(); ++iter)
+  for (ControllerCommandRegistry::const_iterator iter = ControllerCommands.getBeginIter();
+      iter != ControllerCommands.getEndIter(); ++iter)
     Commands.push_back(iter->first);
 
@@ -416 +416 @@
 
   // parse given ControllerCommand
-  if( CommandsMap.count(ControllerInfo.command) == 0) {
+  if(!ControllerCommands.isPresentByName(ControllerInfo.command)) {
     ELOG(1, "Unrecognized command '"+toString(ControllerInfo.command)+"'.");
     return 255;
   }
-  std::deque<ControllerCommand> &commands = CommandsMap[ControllerInfo.command];
+  const ControllerCommand *commands = ControllerCommands.getByName(ControllerInfo.command);
   try
   {
     // execute each command in the queue synchronously
     size_t phase = 1;
-    while (!commands.empty()) {
-      ControllerCommand command = commands.front();
-      commands.pop_front();
-      command();
+    for (ControllerCommand::const_iterator iter = commands->begin();
+       iter != commands->end(); ++iter, ++phase) {
+      (*iter)();
       {
         io_service.reset();