Changeset 267b8d

Timestamp:

Jul 2, 2012, 8:32:05 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:

af9b9ff

Parents:

d9373b

git-author:

Frederik Heber <heber@…> (05/03/12 11:14:23)

git-committer:

Frederik Heber <heber@…> (07/02/12 08:32:05)

Message:

Server now also intercepts sigint and shuts down gracefully.

• new FragmentScheduler::shutdown() function is bound and given as signal handler.
• on signal we first remove all workers and only shutdown and close sockets when there are no workers.
• note that we do not release the signalhandler after first received signal but after a given number as two ctrl-c are required to shut down server having poolworkers.

Location:

src/Fragmentation/Automation

Files:

• FragmentScheduler.cpp (modified) (1 diff)
• FragmentScheduler.hpp (modified) (2 diffs)
• Server.cpp (modified) (4 diffs)
• poolworker.cpp (modified) (1 diff)

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -562 +562 @@
 }
 
+/** Function to shutdown server properly, e.g. for use as signal handler.
+ *
+ * @param sig signal number
+ */
+void FragmentScheduler::shutdown(int sig)
+{
+  LOG(0, "STATUS: Shutting down due to signal " << sig << ".");
+
+  if (!pool.presentIdleWorkers() && !pool.hasBusyWorkers()) {
+    shutdown();
+  } else {
+    removeAllWorkers();
+  }
+}
+
 /** Helper function to shutdown the server properly.
  *

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -49 +49 @@
   ~FragmentScheduler();
 
+  void shutdown(int sig);
 private:
   void sendJobToWorker(const WorkerAddress &address, FragmentJob::ptr &job);
@@ -60 +61 @@
   void recieveNotification(Observable *publisher, Notification_ptr notification);
   void subjectKilled(Observable *publisher);
-
 
   class WorkerListener_t : public Listener

src/Fragmentation/Automation/Server.cpp

@@ -29 +29 @@
 #include <boost/program_options.hpp>
 #include <iostream>
+#include <signal.h>
 
 #include "atexit.hpp"
@@ -35 +36 @@
 #include "FragmentScheduler.hpp"
 
+
+//!> global shutdown function
+boost::function<void (int)> shutdownfunction;
+//!> global signal vector for later releasing
+std::vector<size_t> signals;
+//!> counter for the number of received signals
+size_t NoSignalsReceived = 0;
+//!> maximum number of received signals after which the handlers are released
+const size_t MAX_NOSIGNALSRECEIVED = 3;
+
+void signalhandler(int sig)
+{
+  // increment received signal counter
+  ++NoSignalsReceived;
+
+  // shutdown if we have handler
+  if (shutdownfunction)
+    shutdownfunction(sig);
+
+  if (NoSignalsReceived >= MAX_NOSIGNALSRECEIVED) {
+    // release signal hook again
+    for (std::vector<size_t>::const_iterator iter = signals.begin();
+        iter != signals.end(); ++iter)
+      signal(*iter, NULL);
+  }
+}
 
 int main(int argc, char* argv[])
@@ -47 +74 @@
       ("help,h", "produce help message")
       ("verbosity,v", boost::program_options::value<size_t>(), "set verbosity level")
+      ("signal", boost::program_options::value< std::vector<size_t> >(), "set signal to catch (can be given multiple times)")
       ("workerport", boost::program_options::value< unsigned short >(), "listen on this port for connecting workers")
       ("controllerport", boost::program_options::value< unsigned short >(), "listen on this port for connecting controller")
@@ -101 +129 @@
     boost::asio::io_service io_service;
     FragmentScheduler Server(io_service, workerport, controllerport);
+
+    // catch ctrl-c and shutdown worker properly
+    shutdownfunction = boost::bind(&FragmentScheduler::shutdown, boost::ref(Server), _1);
+    if (vm.count("signal")) {
+      signals =  vm["signal"].as< std::vector<size_t> >();
+      for (std::vector<size_t>::const_iterator iter = signals.begin();
+          iter != signals.end(); ++iter) {
+        LOG(0, "STATUS: Catching signal " << *iter << " via signal handler.");
+        signal(*iter, &signalhandler);
+      }
+    } else {
+      LOG(0, "STATUS: No signals are caught.");
+    }
+
     {
       Info info("io_service");

src/Fragmentation/Automation/poolworker.cpp

@@ -42 +42 @@
 //!> global signal vector for later releasing
 std::vector<size_t> signals;
+//!> counter for the number of received signals
+size_t NoSignalsReceived = 0;
+//!> maximum number of received signals after which the handlers are released
+const size_t MAX_NOSIGNALSRECEIVED = 3;
 
 void signalhandler(int sig)
 {
+  // increment received signal counter
+  ++NoSignalsReceived;
+
   // shutdown if we have handler
   if (shutdownfunction)
     shutdownfunction(sig);
 
-  // release signal hook again
-  for (std::vector<size_t>::const_iterator iter = signals.begin();
-      iter != signals.end(); ++iter)
-    signal(*iter, NULL);
+  if (NoSignalsReceived >= MAX_NOSIGNALSRECEIVED) {
+    // release signal hook again
+    for (std::vector<size_t>::const_iterator iter = signals.begin();
+        iter != signals.end(); ++iter)
+      signal(*iter, NULL);
+  }
 }