Changeset 9a3f84 for src/Fragmentation/Automation/FragmentScheduler.hpp

Timestamp:

Jun 29, 2012, 1:23:14 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:

aec098

Parents:

a8f54b6

git-author:

Frederik Heber <heber@…> (05/21/12 07:14:59)

git-committer:

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

Message:

FragmentScheduler now uses WorkerChoices for handling connection workers.

• Workers always first send address, then their choice and depending on this we branch into various handlers.
• SubmitResultOperation and EnrollInPoolOperation now correctly give choice after sending address.
• handle_enrolled uses getNextIdleWorker() to mark indirectly as busy. This is temporary.
• we do not resubmit if Max_Attempts is 1.

File:

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

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -29 +29 @@
 #include "Pool/WorkerPool.hpp"
 #include "WorkerAddress.hpp"
+#include "WorkerChoices.hpp"
 
 /** FragmentScheduler serves FragmentJobs to Workers and accepts commands from
@@ -60 +61 @@
       pool(_pool),
       result( new FragmentResult(JobId::NoJob) ),
-      callback_sendJobToWorker(_callback)
+      callback_sendJobToWorker(_callback),
+      choice(NoWorkerOperation)
     {}
     virtual ~WorkerListener_t() {}
@@ -68 +70 @@
     void handle_Accept(const boost::system::error_code& e, connection_ptr conn);
 
+    /// Handle completion of Worker operation to read choice
+    void handle_ReadChoice(const boost::system::error_code& e, connection_ptr conn);
+
     /// Worker callback function when job has been sent.
-    void handle_checkAddress(const boost::system::error_code& e, connection_ptr conn);
+    void handle_ReadAddress(const boost::system::error_code& e, connection_ptr conn);
 
     /// Worker callback function when new worker has enrolled.
@@ -76 +81 @@
     /// Worker callback function when result has been received.
     void handle_ReceiveResultFromWorker(const boost::system::error_code& e, connection_ptr conn);
+
+    /// Worker callback function when invalid result has been received.
+    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;
@@ -86 +97 @@
     WorkerPool &pool;
 
-    /// result that is received from the client.
+    //!> result that is received from the client.
     FragmentResult::ptr result;
 
@@ -92 +103 @@
     boost::function<void (const WorkerAddress&, FragmentJob::ptr&)> callback_sendJobToWorker;
 
-    // static entity to indicate to clients that the queue is empty.
-    static FragmentJob::ptr NoJob;
+    //!> choice
+    enum WorkerChoices choice;
   };
 
@@ -136 +147 @@
     FragmentQueue & JobsQueue;
 
-    /// bunch of jobs received from controller before placed in JobsQueue
+    //!> bunch of jobs received from controller before placed in JobsQueue
     std::vector<FragmentJob::ptr> jobs;
 
-    /// number of jobs that are waiting to be and are calculated, required for returning status
+    //!> number of jobs that are waiting to be and are calculated, required for returning status
     std::vector<size_t> jobInfo;
 
-    // choice
+    //!> choice
     enum ControllerChoices choice;
 
@@ -154 +165 @@
 
 private:
-  /// Queue with data to be sent to each client.
+  //!> Queue with data to be sent to each client.
   FragmentQueue JobsQueue;