Changeset aec098

Timestamp:

Jun 29, 2012, 1:23:20 PM (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:

e8f397

Parents:

9a3f84

git-author:

Frederik Heber <heber@…> (03/04/12 16:12:28)

git-committer:

Frederik Heber <heber@…> (06/29/12 13:23:20)

Message:

Added signal handling function to poolworker to intercept ctrl-c via PoolWorker::shutdown().

• this is for gracefully shutting down the worker (i.e. letting server know that we are off).
• Added PoolWorker::shutdown() function to gracefully shutdown.
• We use RemoveFromPoolOperation() to unlist from server's pool.
• PoolWorker now contains ref to io_Service in order to stop the service on shutdown.

Location:

src/Fragmentation/Automation

Files:

• Pool/PoolWorker.cpp (modified) (3 diffs)
• Pool/PoolWorker.hpp (modified) (5 diffs)
• poolworker.cpp (modified) (3 diffs)

src/Fragmentation/Automation/Pool/PoolWorker.cpp

@@ -52 +52 @@
  * We automatically connect to the given pool and enroll.
  *
- * @param io_service io service for creating connections
+ * @param _io_service io service for creating connections
  * @param _host host part of address of pool to connect to
  * @param _service service part of address of pool to connect to
@@ -59 +59 @@
  */
 PoolWorker::PoolWorker(
-    boost::asio::io_service& io_service,
+    boost::asio::io_service& _io_service,
     const std::string& _host,
     const std::string& _service,
     const std::string& listenhost,
     const std::string& listenservice) :
-  connection_(io_service),
-  PoolListener(io_service, boost::lexical_cast<unsigned short>(listenservice), *this),
+  io_service(_io_service),
+  PoolListener(_io_service, boost::lexical_cast<unsigned short>(listenservice), *this),
   address(listenhost, listenservice),
+  connection_(_io_service),
   enrollOp(connection_, address),
   submitOp(connection_, address),
   submitresult(boost::bind(&AsyncOperation::operator(),
       boost::ref(submitOp),
+      _host, _service)),
+  removeOp(connection_, address),
+  removeme(boost::bind(&Operation::operator(),
+      boost::ref(removeOp),
       _host, _service))
 {
@@ -138 +143 @@
   submitresult();
 }
+
+/** Helper function to shutdown the worker properly.
+ *
+ * Note that we will use ShutdownWorkerOperation to unlist from server's pool.
+ *
+ */
+void PoolWorker::shutdown(int sig)
+{
+  LOG(1, "INFO: Shutting down due to signal "+toString(sig)+".");
+
+  // remove us from pool
+  removeme();
+
+  // somehow stop listener
+  PoolListener.closeSocket();
+
+  // finally, stop io_service
+  io_service.stop();
+}

src/Fragmentation/Automation/Pool/PoolWorker.hpp

@@ -23 +23 @@
 #include "Jobs/FragmentJob.hpp"
 #include "Controller/Commands/EnrollInPoolOperation.hpp"
+#include "Controller/Commands/RemoveFromPoolOperation.hpp"
 #include "Controller/Commands/SubmitResultOperation.hpp"
 #include "Listener.hpp"
@@ -50 +51 @@
 
   void WorkOnJob(FragmentJob::ptr &job);
+  void removeFromPool();
+  void shutdown(int sig);
 
   class PoolListener_t : public Listener
@@ -79 +82 @@
 
 private:
-  //!> The Connection to the server.
-  Connection connection_;
+  //!> reference to io_service which we use for connections
+  boost::asio::io_service& io_service;
 
   //!> The listener for the WorkerPool
@@ -87 +90 @@
   //!> address of this worker
   const WorkerAddress address;
+
+  //!> The Connection to the server for the stored operations
+  Connection connection_;
 
   //!> operation that handles obtaining a job
@@ -96 +102 @@
   //!> internally bound function such that host and service don't have to be stored, submits result
   boost::function<void ()> submitresult;
+
+  //!> operation that handles removal from pool
+  RemoveFromPoolOperation removeOp;
+
+  //!> internally bound function such that host and service don't have to be stored, submits result
+  boost::function<void ()> removeme;
 };
 

src/Fragmentation/Automation/poolworker.cpp

@@ -29 +29 @@
 #include <iostream>
 #include <boost/lexical_cast.hpp>
+#include <signal.h>
 
 #include "atexit.hpp"
@@ -35 +36 @@
 #include "Pool/PoolWorker.hpp"
 
+boost::function<void (int)> shutdownfunction;
+
+void signalhandler(int sig)
+{
+  if (shutdownfunction)
+    shutdownfunction(sig);
+  signal(SIGINT, NULL);
+}
 
 int main(int argc, char* argv[])
@@ -56 +65 @@
     boost::asio::io_service io_service;
     PoolWorker client(io_service, argv[1], argv[2], argv[3], argv[4]);
+
+    // catch ctrl-c and shutdown worker properly
+    shutdownfunction = boost::bind(&PoolWorker::shutdown, boost::ref(client), _1);
+//    signal(SIGABRT, &signalhandler);
+//    signal(SIGTERM, &signalhandler);
+    signal(SIGINT, &signalhandler);
+
+    // process io requests
     {
       Info info("io_service");