Changeset b15c4f

Timestamp:

Jul 2, 2012, 8:31:59 AM (13 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:

668b55

Parents:

befcf8

git-author:

Frederik Heber <heber@…> (05/03/12 14:18:24)

git-committer:

Frederik Heber <heber@…> (07/02/12 08:31:59)

Message:

Added new RemoveAllWorkerOperation and removeall command to FragmentController.

• FragmentScheduler::ControllerListener_t has second bound function to removeAllWorker() from FragmentScheduler instance.
• this is preparatory to split shutdown into first removeal and then closing of sockets.

Location:

src/Fragmentation/Automation

Files:

• ControllerChoices.hpp (modified) (1 diff)
• FragmentController.cpp (modified) (3 diffs)
• FragmentController.hpp (modified) (1 diff)
• FragmentScheduler.cpp (modified) (3 diffs)
• FragmentScheduler.hpp (modified) (3 diffs)
• Makefile.am (modified) (2 diffs)
• Operations/Controllers/RemoveAllWorkerOperation.cpp (added)
• Operations/Controllers/RemoveAllWorkerOperation.hpp (added)
• Pool/PoolWorker.cpp (modified) (2 diffs)
• Pool/PoolWorker.hpp (modified) (1 diff)
• controller.cpp (modified) (5 diffs)

src/Fragmentation/Automation/ControllerChoices.hpp

@@ -21 +21 @@
   CheckState,
   ReceiveResults,
+  RemoveAll,
   ShutdownControllerSocket
 };

src/Fragmentation/Automation/FragmentController.cpp

@@ -32 +32 @@
 #include "Operations/Controllers/GetNextJobIdOperation.hpp"
 #include "Operations/Controllers/ReceiveResultsOperation.hpp"
+#include "Operations/Controllers/RemoveAllWorkerOperation.hpp"
 #include "Operations/Controllers/SendJobsOperation.hpp"
 #include "Operations/Controllers/ShutdownOperation.hpp"
@@ -54 +55 @@
   Commands.registerInstance(new GetNextJobIdOperation(connection_));
   Commands.registerInstance(new ReceiveResultsOperation(connection_));
+  Commands.registerInstance(new RemoveAllWorkerOperation(connection_));
   Commands.registerInstance(new SendJobsOperation(connection_));
   Commands.registerInstance(new ShutdownOperation(connection_));
@@ -171 +173 @@
 }
 
+/** Requests removal of all idle workers from server.
+ *
+ * @param host address of server
+ * @param service port/service of server
+ */
+void FragmentController::removeall(
+    const std::string &host,
+    const std::string &service)
+{
+  RemoveAllWorkerOperation *removeall = static_cast<RemoveAllWorkerOperation *>(
+      Commands.getByName("removeallworker"));
+  (*removeall)(host, service);
+}
+
 /** Obtains results from done jobs from server.
  *

src/Fragmentation/Automation/FragmentController.hpp

@@ -49 +49 @@
   void checkResults(const std::string &host, const std::string &service);
   void printDoneJobs();
+  void removeall(const std::string &host, const std::string &service);
   void receiveResults(const std::string &host, const std::string &service);
   std::vector<FragmentResult::ptr> getReceivedResults();

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -68 +68 @@
         boost::bind(&FragmentScheduler::sendJobToWorker, boost::ref(*this), _1, _2)),
     ControllerListener(_io_service, controllerport, JobsQueue,
+        boost::bind(&FragmentScheduler::removeAllWorkers, boost::ref(*this)),
         boost::bind(&FragmentScheduler::shutdown, boost::ref(*this))),
     connection(_io_service)
@@ -374 +375 @@
       break;
     }
+    case RemoveAll:
+    {
+      removeallWorkers();
+      break;
+    }
     case ReceiveResults:
     {
@@ -563 +569 @@
  *
  * \todo one should idle here until all workers have returned from
- * calculating stuff (or workers need to still listen while the are
+ * calculating stuff (or workers need to still listen while they are
  * calculating which is probably better).
  *

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -126 +126 @@
         unsigned short port,
         FragmentQueue &_JobsQueue,
+        boost::function<void ()> _removeallWorkers,
         boost::function<void ()> _shutdownAllSockets) :
       Listener(io_service, port),
@@ -131 +132 @@
       jobInfo((size_t)2, 0),
       choice(NoControllerOperation),
+      removeallWorkers(_removeallWorkers),
       shutdownAllSockets(_shutdownAllSockets),
       globalId(0)
@@ -173 +175 @@
     //!> choice
     enum ControllerChoices choice;
+
+    //!> bound function to remove all workers
+    boost::function<void ()> removeallWorkers;
 
     //!> bound function to shutdown all sockets

src/Fragmentation/Automation/Makefile.am

@@ -49 +49 @@
   Operations/Controllers/GetNextJobIdOperation.cpp \
   Operations/Controllers/ReceiveResultsOperation.cpp \
+  Operations/Controllers/RemoveAllWorkerOperation.cpp \
   Operations/Controllers/SendJobsOperation.cpp \
   Operations/Controllers/ShutdownOperation.cpp \
@@ -67 +68 @@
   Operations/Controllers/GetNextJobIdOperation.hpp \
   Operations/Controllers/ReceiveResultsOperation.hpp \
+  Operations/Controllers/RemoveAllWorkerOperation.hpp \
   Operations/Controllers/SendJobsOperation.hpp \
   Operations/Controllers/ShutdownOperation.hpp \

src/Fragmentation/Automation/Pool/PoolWorker.cpp

@@ -159 +159 @@
   LOG(1, "INFO: Shutting down due to signal "+toString(sig)+".");
 
-  // remove us from pool
-  removeme();
-
   shutdown();
 }
@@ -171 +168 @@
 void PoolWorker::shutdown()
 {
+  // remove us from pool
+  removeme();
+
   // somehow stop listener
   PoolListener.closeSocket();

src/Fragmentation/Automation/Pool/PoolWorker.hpp

@@ -107 +107 @@
   RemoveFromPoolOperation removeOp;
 
-  //!> internally bound function such that host and service don't have to be stored, submits result
+  //!> internally bound function such that host and service don't have to be stored, removes us from server
   boost::function<void ()> removeme;
 };

src/Fragmentation/Automation/controller.cpp

@@ -56 +56 @@
   ReceiveResultsIndex = 4,
   ReceiveMPQCIndex = 5,
-  ShutdownIndex = 6,
+  RemoveAllIndex = 6,
+  ShutdownIndex = 7,
 };
 
@@ -321 +322 @@
   CommandsMap.insert( std::make_pair("receiveresults", ReceiveResultsIndex) );
   CommandsMap.insert( std::make_pair("receivempqc", ReceiveMPQCIndex) );
+  CommandsMap.insert( std::make_pair("removeall", RemoveAllIndex) );
   CommandsMap.insert( std::make_pair("shutdown", ShutdownIndex) );
   try
@@ -367 +369 @@
         break;
       case ReceiveMPQCIndex:
+        break;
+      case RemoveAllIndex:
         break;
       case ShutdownIndex:
@@ -432 +436 @@
         break;
       }
+      case RemoveAllIndex:
+      {
+        controller.removeall(argv[1], argv[2]);
+        break;
+      }
       case ShutdownIndex:
       {
@@ -481 +490 @@
         break;
       }
+      case RemoveAllIndex:
+        break;
       case ShutdownIndex:
         break;