Changeset 668b55

Timestamp:

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

270364

Parents:

b15c4f

git-author:

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

git-committer:

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

Message:

FragmentScheduler::shutdown() now returns bool and does not remove workers anymore.

Location:

src/Fragmentation/Automation

Files:

• FragmentScheduler.cpp (modified) (3 diffs)
• FragmentScheduler.hpp (modified) (3 diffs)

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -395 +395 @@
       // only allow for shutdown when there are no more jobs in the queue
       if (!JobsQueue.isJobPresent()) {
-        LaunchNewAcceptor = false;
+        // we shutdown? Hence, also shutdown controller
+        LaunchNewAcceptor = !shutdownAllSockets();
       } else {
         ELOG(2, "There are still jobs waiting in the queue.");
@@ -413 +414 @@
       // Start an accept operation for a new Connection.
       initiateSocket();
-    } else {
-      // we shutdown? Hence, also shutdown controller
-      shutdownAllSockets();
     }
   }
@@ -572 +570 @@
  * calculating which is probably better).
  *
- */
-void FragmentScheduler::shutdown()
-{
-  LOG(1, "INFO: Shutting all down ...");
-
-  /// Remove all workers
-  removeAllWorkers();
-
-  /// close the worker listener's socket
-  WorkerListener.closeSocket();
-
-  /// close the controller listener's socket
-  ControllerListener.closeSocket();
-
-  /// finally, stop the io_service
-  io_service.stop();
+ * \note We only shutdown when there are no workers left
+ *
+ * @return true - doing shutdown, false - precondition not met, not shutting down
+ */
+bool FragmentScheduler::shutdown()
+{
+  if (!pool.presentIdleWorkers() && !pool.hasBusyWorkers()) {
+    LOG(1, "INFO: Shutting all down ...");
+
+    /// close the worker listener's socket
+    WorkerListener.closeSocket();
+
+    /// close the controller listener's socket
+    ControllerListener.closeSocket();
+
+    /// finally, stop the io_service
+    io_service.stop();
+    return true;
+  } else {
+    ELOG(2, "There are still idle or busy workers present.");
+    return false;
+  }
 }
 

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -52 +52 @@
   void sendJobToWorker(const WorkerAddress &address, FragmentJob::ptr &job);
   void sendAvailableJobToNextIdleWorker();
-  void shutdown();
+  bool shutdown();
   void shutdownWorker(const WorkerAddress &address);
   void removeAllWorkers();
@@ -127 +127 @@
         FragmentQueue &_JobsQueue,
         boost::function<void ()> _removeallWorkers,
-        boost::function<void ()> _shutdownAllSockets) :
+        boost::function<bool ()> _shutdownAllSockets) :
       Listener(io_service, port),
       JobsQueue(_JobsQueue),
@@ -180 +180 @@
 
     //!> bound function to shutdown all sockets
-    boost::function<void ()> shutdownAllSockets;
+    boost::function<bool ()> shutdownAllSockets;
 
     // TODO: replace this instance by a IdPool.