Changeset 4ccc8d for src

Timestamp:

Jul 6, 2012, 10:18:44 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:

2a20bd

Parents:

6c52d2

git-author:

Frederik Heber <heber@…> (06/01/12 17:35:01)

git-committer:

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

Message:

Placed signalhandling into own class SignalHandler from PoolWorker.

• signal() requires pointer to global function as handler, not some bound member function.

Location:

src

Files:

• Makefile.am (modified) (1 diff)
• SignalHandler.cpp (added)
• SignalHandler.hpp (added)
• poolworker.cpp (modified) (3 diffs)

src/Makefile.am

@@ -398 +398 @@
   ${CodePatterns_LIBS}
 
-PoolWorker_SOURCES = $(POOLWORKERSOURCE) $(POOLWORKERHEADER) poolworker.cpp DefaultOptions.cpp DefaultOptions.hpp SignalOptions.cpp SignalOptions.hpp WorkerOptions.cpp WorkerOptions.hpp
+PoolWorker_SOURCES = $(POOLWORKERSOURCE) $(POOLWORKERHEADER) poolworker.cpp DefaultOptions.cpp DefaultOptions.hpp SignalHandler.cpp SignalHandler.hpp SignalOptions.cpp SignalOptions.hpp WorkerOptions.cpp WorkerOptions.hpp
 PoolWorker_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM__OPTIONS_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
 PoolWorker_CXXFLAGS = $(AM_CPPFLAGS)

src/poolworker.cpp

@@ -30 +30 @@
 #include <boost/program_options.hpp>
 #include <boost/lexical_cast.hpp>
-#include <signal.h>
 #include <vector>
 
@@ -39 +38 @@
 #include "atexit.hpp"
 #include "Jobs/SystemCommandJob.hpp"
+#include "SignalHandler.hpp"
 #include "WorkerOptions.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);
-  }
-}
 
 
@@ -113 +87 @@
 
     // catch ctrl-c and shutdown worker properly
-    shutdownfunction = boost::bind(&PoolWorker::shutdown, boost::ref(client), _1);
-    for (std::vector<size_t>::const_iterator iter = WorkerOpts.signals.begin();
-        iter != WorkerOpts.signals.end(); ++iter) {
-      LOG(0, "STATUS: Catching signal " << *iter << " via signal handler.");
-      signal(*iter, &signalhandler);
-    }
+    boost::function<void (int)> shutdownfunction = boost::bind(&PoolWorker::shutdown, boost::ref(client), _1);
+    SignalHandler signalhandler(shutdownfunction, WorkerOpts.signals);
 
     // process io requests