Changeset 9d7c6a

Timestamp:

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

2ab0b0

Parents:

b08c7c

git-author:

Frederik Heber <heber@…> (05/13/12 17:53:34)

git-committer:

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

Message:

PoolWorker now has an OperationQueue and ServerAddress.

• OperationQueue works the same way as for FragmentScheduler. Operations are simply handed over to it with callback function in place from cstor.
• ServerAddress stores server's address to hand to OperationQueue on pushing the operation.

Location:

src/Fragmentation/Automation/Pool

Files:

• PoolWorker.cpp (modified) (5 diffs)
• PoolWorker.hpp (modified) (2 diffs)

src/Fragmentation/Automation/Pool/PoolWorker.cpp

@@ -37 +37 @@
 #include "Jobs/MPQCCommandJob.hpp"
 #include "Jobs/SystemCommandJob.hpp"
+#include "Operations/Workers/EnrollInPoolOperation.hpp"
+#include "Operations/Workers/RemoveFromPoolOperation.hpp"
+#include "Operations/Workers/SubmitResultOperation.hpp"
 #include "Results/FragmentResult.hpp"
 #include "PoolWorker.hpp"
@@ -53 +56 @@
  *
  * @param _io_service io service for creating connections
- * @param _host host part of address of pool to connect to
- * @param _service service part of address of pool to connect to
- * @param listenhost host part of address of this instance for listening to pool connections
- * @param listenservice seervice part of address of this instance for listening to pool connections
+ * @param _host host part of MyAddress of pool to connect to
+ * @param _service service part of MyAddress of pool to connect to
+ * @param listenhost host part of MyAddress of this instance for listening to pool connections
+ * @param listenservice seervice part of MyAddress of this instance for listening to pool connections
  */
 PoolWorker::PoolWorker(
@@ -67 +70 @@
   PoolListener(_io_service, boost::lexical_cast<unsigned short>(listenservice), *this),
   MyAddress(listenhost, listenservice),
+  ServerAddress(_host, _service),
   connection_(_io_service),
-  failed(boost::bind(&ExitflagContainer::setExitflag, this, ExitflagContainer::ErrorFlag)),
-  closingdown(boost::bind(&PoolWorker::finish, this)),
-  initiateme(boost::bind(&PoolListener_t::initiateSocket, boost::ref(PoolListener))),
-  enrollOp(connection_, MyAddress, initiateme, failed),
-  submitOp(connection_, MyAddress, AsyncOperation::NoOpCallback, failed),
-  submitresult(boost::bind(&AsyncOperation::operator(),
-      boost::ref(submitOp),
-      _host, _service)),
-  removeOp(connection_, MyAddress, closingdown, failed),
-  removeme(boost::bind(&AsyncOperation::operator(),
-      boost::ref(removeOp),
-      _host, _service))
+  failed(boost::bind(&ExitflagContainer::setExitflag, this, ExitflagContainer::ErrorFlag))
 {
   Info info(__FUNCTION__);
 
-  // always enroll
-  enrollOp(_host,_service);
+  // always enroll and make listenining initiation depend on its success
+  const boost::function<void ()> initiateme =
+      boost::bind(&PoolListener_t::initiateSocket, boost::ref(PoolListener));
+  AsyncOperation *enrollOp = new EnrollInPoolOperation(connection_, MyAddress, initiateme, failed);
+  LOG(2, "DEBUG: Putting enroll in pool operation into queue ...");
+  OpQueue.push_back(enrollOp, ServerAddress);
 }
 
@@ -144 +141 @@
   FragmentResult::ptr result = job->Work();
   LOG(2, "DEBUG: Setting result " << result->getId() << ".");
-  submitOp.setResult(result);
+
+  AsyncOperation *submitOp = new SubmitResultOperation(connection_, MyAddress, AsyncOperation::NoOpCallback, failed);
+  static_cast<SubmitResultOperation *>(submitOp)->setResult(result);
 
   // submit result
-  LOG(2, "DEBUG: Sending result ...");
-  submitresult();
+  LOG(2, "DEBUG: Putting send result operation into queue ...");
+  OpQueue.push_back(submitOp, ServerAddress);
 }
 
@@ -172 +171 @@
 {
   // remove us from pool
-  removeme();
+  boost::function<void ()> closingdown = boost::bind(&PoolWorker::finish, this);
+  AsyncOperation *removeOp = new RemoveFromPoolOperation(connection_, MyAddress, closingdown, failed);
+  LOG(2, "DEBUG: Putting remove from pool operation into queue ...");
+  OpQueue.push_back(removeOp, ServerAddress);
 }
 

src/Fragmentation/Automation/Pool/PoolWorker.hpp

@@ -23 +23 @@
 #include "ExitflagContainer.hpp"
 #include "Jobs/FragmentJob.hpp"
-#include "Operations/Workers/EnrollInPoolOperation.hpp"
-#include "Operations/Workers/RemoveFromPoolOperation.hpp"
-#include "Operations/Workers/SubmitResultOperation.hpp"
+#include "Operations/OperationQueue.hpp"
 #include "Listener.hpp"
 #include "WorkerAddress.hpp"
@@ -98 +96 @@
   const WorkerAddress MyAddress;
 
+  //!> address of the server we work for
+  WorkerAddress ServerAddress;
+
   //!> The Connection to the server for the stored operations
   Connection connection_;
 
-  //!> internally bound function that sets the Exitflag to ErrorFlag
+  //!> bound function as callback when operation fails
   boost::function<void ()> failed;
 
-  //!> internally bound function that sets the Exitflag to ErrorFlag
-  const boost::function<void ()> closingdown;
-
-  //!> internally bound function initiates the PoolListener's socket
-  const boost::function<void ()> initiateme;
-
-  //!> operation that handles obtaining a job
-  EnrollInPoolOperation enrollOp;
-
-  //!> operation that handles submitting job's result
-  SubmitResultOperation submitOp;
-
-  //!> internally bound function such that host and service don't have to be stored, submits result
-  boost::function<void ()> submitresult;
-
-  //!> operation that handles removal from pool
-  RemoveFromPoolOperation removeOp;
-
-  //!> internally bound function such that host and service don't have to be stored, removes us from server
-  boost::function<void ()> removeme;
+  //!> internal queue for all asynchronous operations
+  OperationQueue OpQueue;
 };