Changeset 9a3f84 for src/Fragmentation/Automation/Controller/Commands

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.

Location:

src/Fragmentation/Automation/Controller/Commands

Files:

• EnrollInPoolOperation.cpp (modified) (4 diffs)
• EnrollInPoolOperation.hpp (modified) (1 diff)
• ObtainJobOperation.cpp (modified) (1 diff)
• SubmitResultOperation.cpp (modified) (6 diffs)
• SubmitResultOperation.hpp (modified) (1 diff)

src/Fragmentation/Automation/Controller/Commands/EnrollInPoolOperation.cpp

@@ -30 +30 @@
 #include "Jobs/FragmentJob.hpp"
 #include "WorkerAddress.hpp"
+#include "WorkerChoices.hpp"
 
 /// Handle completion of a connect operation.
@@ -41 +42 @@
     // of jobs. The connection::async_read() function will automatically
     // decode the data that is read from the underlying socket.
-    LOG(1, "INFO: Enrolling in pool with " << address << "...");
     connection_.async_write(address,
-      boost::bind(&EnrollInPoolOperation::handle_FinishOperation, this,
+      boost::bind(&EnrollInPoolOperation::handle_SendChoice, this,
       boost::asio::placeholders::error));
   } else if (endpoint_iterator != boost::asio::ip::tcp::resolver::iterator()) {
@@ -61 +61 @@
 
 
-/// Handle sent of address
-void EnrollInPoolOperation::handle_sendAddress(const boost::system::error_code& e)
+/// Handle sending choice
+void EnrollInPoolOperation::handle_SendChoice(const boost::system::error_code& e)
+{
+  Info info(__FUNCTION__);
+  if (!e)
+  {
+    // Successfully established connection. Start operation to read the list
+    // of jobs. The connection::async_read() function will automatically
+    // decode the data that is read from the underlying socket.
+    LOG(1, "INFO: Enrolling in pool with " << address << " ...");
+    enum WorkerChoices choice = EnrollInPool;
+    connection_.async_write(choice,
+      boost::bind(&EnrollInPoolOperation::handle_ReceiveFlag, this,
+      boost::asio::placeholders::error));
+  } else {
+    // An error occurred. Log it and return. Since we are not starting a new
+    // operation the io_service will run out of work to do and the client will
+    // exit.
+    ELOG(1, e.message());
+  }
+}
+
+
+/// Handle receiving flag
+void EnrollInPoolOperation::handle_ReceiveFlag(const boost::system::error_code& e)
 {
   Info info(__FUNCTION__);
@@ -81 +104 @@
 }
 
-/// Handle sent of address
+/// Handle received flag
 void EnrollInPoolOperation::handle_FinishOperation(const boost::system::error_code& e)
 {

src/Fragmentation/Automation/Controller/Commands/EnrollInPoolOperation.hpp

@@ -47 +47 @@
       boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
 
-  /// Handle sent of address
-  void handle_sendAddress(const boost::system::error_code& e);
+  /// Handle sending choice
+  void handle_SendChoice(const boost::system::error_code& e);
 
-  /// Handle sent of address
+  /// Handle receiving flag
+  void handle_ReceiveFlag(const boost::system::error_code& e);
+
+  /// Handle received flag
   void handle_FinishOperation(const boost::system::error_code& e);
 

src/Fragmentation/Automation/Controller/Commands/ObtainJobOperation.cpp

@@ -29 +29 @@
 #include "CodePatterns/Log.hpp"
 #include "Jobs/FragmentJob.hpp"
+#include "WorkerChoices.hpp"
 
 /// Handle completion of a connect operation.

src/Fragmentation/Automation/Controller/Commands/SubmitResultOperation.cpp

@@ -29 +29 @@
 #include "CodePatterns/Log.hpp"
 #include "Results/FragmentResult.hpp"
+#include "WorkerChoices.hpp"
 
 
@@ -43 +44 @@
     LOG(1, "INFO: Sending address " << address << " ...");
     connection_.async_write(address,
-      boost::bind(&SubmitResultOperation::handle_SendAddress, this,
+      boost::bind(&SubmitResultOperation::handle_SendChoice, this,
       boost::asio::placeholders::error));
   } else if (endpoint_iterator != boost::asio::ip::tcp::resolver::iterator()) {
@@ -62 +63 @@
 
 /// Callback function when address has been sent and result is about to
-void SubmitResultOperation::handle_SendAddress(const boost::system::error_code& e)
+void SubmitResultOperation::handle_SendChoice(const boost::system::error_code& e)
 {
   Info info(__FUNCTION__);
@@ -70 +71 @@
     // of jobs. The connection::async_write() function will automatically
     // decode the data that is read from the underlying socket.
-    LOG(1, "INFO: Sending result #" << result->getId() << " ...");
-    connection_.async_write(result,
+    enum WorkerChoices choice = SendResult;
+    connection_.async_write(choice,
       boost::bind(&SubmitResultOperation::handle_SendResult, this,
       boost::asio::placeholders::error));
@@ -83 +84 @@
 }
 
-/// Callback function when result has been sent.
+/// Callback function when address has been sent and result is about to
 void SubmitResultOperation::handle_SendResult(const boost::system::error_code& e)
 {
   Info info(__FUNCTION__);
-  if (!e) {
-    LOG(1, "INFO: result #" << result->getId() << " sent.");
-    AsyncOperation::handle_FinishOperation(e);
+  if (!e)
+  {
+    // Successfully established connection. Start operation to read the list
+    // of jobs. The connection::async_write() function will automatically
+    // decode the data that is read from the underlying socket.
+    LOG(1, "INFO: Sending result #" << result->getId() << " ...");
+    connection_.async_write(result,
+      boost::bind(&SubmitResultOperation::handle_FinishOperation, this,
+      boost::asio::placeholders::error));
   } else {
     // An error occurred. Log it and return. Since we are not starting a new
@@ -98 +105 @@
   }
 }
+
+/// Callback function when result has been sent.
+void SubmitResultOperation::handle_FinishOperation(const boost::system::error_code& e)
+{
+  Info info(__FUNCTION__);
+  LOG(1, "INFO: result #" << result->getId() << " sent.");
+  AsyncOperation::handle_FinishOperation(e);
+}

src/Fragmentation/Automation/Controller/Commands/SubmitResultOperation.hpp

@@ -68 +68 @@
 
   /// Callback function when address has been sent and result is about to.
-  void handle_SendAddress(const boost::system::error_code& e);
+  void handle_SendChoice(const boost::system::error_code& e);
 
   /// Callback function when result has been sent.
   void handle_SendResult(const boost::system::error_code& e);
+
+  /// Callback function when result has been sent.
+  void handle_FinishOperation(const boost::system::error_code& e);
 
 private: