Changeset 2344a3 for src/Fragmentation/Automation/FragmentScheduler.hpp

Timestamp:

Jul 2, 2012, 7:54:11 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:

1cfd17

Parents:

fb255d

git-author:

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

git-committer:

Frederik Heber <heber@…> (07/02/12 07:54:11)

Message:

FragmentScheduler is now an Observer of JobsQueue and pool.

• ControllerListener gets a bound function shutdown() to pass on shutdown request from controller on to FragmentScheduler itself to shutdown both sockets and the io_service.
• FragmentScheduler is notified of JobAdded and WorkerIdle to send out jobs to workers.
• Now, FragmentScheduler always initiates WorkerListener's socket.
• removed temporary construct in WorkerListener_t::handle_ReceivedResults which launched the next job.
• TESTFIX: Regression test Fragmenation/Automation completerun now sends three jobs (this would have lead to crash with temporary construct above).

File:

• src/Fragmentation/Automation/FragmentScheduler.hpp (modified) (6 diffs)

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -18 +18 @@
 #include <boost/function.hpp>
 
+#include "CodePatterns/Observer/Observer.hpp"
 #include "Connection.hpp"
 #include "ControllerChoices.hpp"
 #include "Controller/Commands/SendJobToWorkerOperation.hpp"
+#include "ControllerChoices.hpp"
 #include "FragmentQueue.hpp"
 #include "GlobalJobId.hpp"
@@ -35 +37 @@
  *
  */
-class FragmentScheduler
+class FragmentScheduler : public Observer
 {
 public:
@@ -41 +43 @@
   /// Connection.
   FragmentScheduler(boost::asio::io_service& io_service, unsigned short workerport, unsigned short controllerport);
+  ~FragmentScheduler();
 
 private:
   void sendJobToWorker(const WorkerAddress &address, FragmentJob::ptr &job);
-//  void shutdownWorker(const WorkerAddress &address);
-//  void removeAllWorkers();
+  void sendAvailableJobToNextIdleWorker();
+  void shutdown();
+  void shutdownWorker(const WorkerAddress &address);
+  void removeAllWorkers();
+
+  void update(Observable *publisher);
+  void recieveNotification(Observable *publisher, Notification_ptr notification);
+  void subjectKilled(Observable *publisher);
 
   class WorkerListener_t : public Listener
@@ -85 +94 @@
     void handle_RejectResultFromWorker(const boost::system::error_code& e, connection_ptr conn);
   private:
-    //!> static entity to indicate to clients that the queue is empty.
-    static FragmentJob::ptr NoJob;
-
     //!> address of new Worker
     WorkerAddress address;
@@ -114 +120 @@
         unsigned short port,
         FragmentQueue &_JobsQueue,
-        boost::function<void ()> _initiateWorkerSocket) :
+        boost::function<void ()> _shutdownAllSockets) :
       Listener(io_service, port),
       JobsQueue(_JobsQueue),
       jobInfo((size_t)2, 0),
       choice(NoControllerOperation),
-      globalId(0),
-      initiateWorkerSocket(_initiateWorkerSocket)
+      shutdownAllSockets(_shutdownAllSockets),
+      globalId(0)
     {}
     virtual ~ControllerListener_t() {}
@@ -156 +162 @@
     enum ControllerChoices choice;
 
+    //!> bound function to shutdown all sockets
+    boost::function<void ()> shutdownAllSockets;
+
     // TODO: replace this instance by a IdPool.
     //!> global id to give next available job id
     GlobalJobId globalId;
-
-    //!> callback function to tell that worker socket should be enabled
-    boost::function<void ()> initiateWorkerSocket;
   };
 
 private:
+  //!> static entity to indicate to clients that the queue is empty.
+  static FragmentJob::ptr NoJob;
+
+  //!> reference to the io_service which we use for connections
+  boost::asio::io_service& io_service;
+
   //!> Queue with data to be sent to each client.
   FragmentQueue JobsQueue;