Changeset ba995d

Timestamp:

Jul 2, 2012, 8:31:57 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:

befcf8

Parents:

a40c85

git-author:

Frederik Heber <heber@…> (04/24/12 15:34:20)

git-committer:

Frederik Heber <heber@…> (07/02/12 08:31:57)

Message:

ShutdownWorkerOperation is now an asynchronous operation.

• FragmentScheduler places shutdown op into queue as well and waits for empty queue in removeAllWorkers().
• OperationQueue has convenience function empty().

Location:

src/Fragmentation/Automation

Files:

• FragmentScheduler.cpp (modified) (3 diffs)
• FragmentScheduler.hpp (modified) (1 diff)
• Operations/OperationQueue.hpp (modified) (1 diff)
• Operations/Servers/ShutdownWorkerOperation.cpp (modified) (1 diff)
• Operations/Servers/ShutdownWorkerOperation.hpp (modified) (1 diff)

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -69 +69 @@
     ControllerListener(_io_service, controllerport, JobsQueue,
         boost::bind(&FragmentScheduler::shutdown, boost::ref(*this))),
-    connection(_io_service),
-    shutdownWorkerOp(connection)
+    connection(_io_service)
 {
   Info info(__FUNCTION__);
@@ -527 +526 @@
       "FragmentScheduler::sendJobToWorker() - Worker "+toString(address)+" is already busy.");
   LOG(2, "INFO: Shutting down worker " << address << "...");
-  shutdownWorkerOp(address.host, address.service);
+  AsyncOperation *shutdownWorkerOp = new ShutdownWorkerOperation(connection);
+  OpQueue.push_back(shutdownWorkerOp, address);
 }
 
@@ -548 +548 @@
     shutdownWorker(address);
   }
+  // wait for pending shutdown operations
+  while (!OpQueue.empty());
   pool.removeAllWorkers();
 }

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -221 +221 @@
   //!> internal queue for all asynchronous operations
   OperationQueue OpQueue;
-
-  //!> internal operation to shutdown a worker
-  ShutdownWorkerOperation shutdownWorkerOp;
 };
 

src/Fragmentation/Automation/Operations/OperationQueue.hpp

@@ -54 +54 @@
   void push_back(AsyncOperation *&op, const WorkerAddress &address);
 
+  /** States whether the queue is empty.
+   *
+   * @return true - queue is empty, false - operations are pending
+   */
+  bool empty() const {
+    return queue.empty();
+  }
+
   void update(Observable *publisher);
   void recieveNotification(Observable *publisher, Notification_ptr notification);

src/Fragmentation/Automation/Operations/Servers/ShutdownWorkerOperation.cpp

@@ -35 +35 @@
 FragmentJob::ptr ShutdownWorkerOperation::NoJob(new SystemCommandJob(std::string(""), std::string(""), JobId::NoJob));
 
-/** Virtual internal function to give shutdown choice.
+/** Handle connect operation to shutdown scheduler.
  *
+ * \param e error code if something went wrong
+ * \param endpoint_iterator endpoint of the connection
  */
-void ShutdownWorkerOperation::internal()
+void ShutdownWorkerOperation::handle_connect(const boost::system::error_code& e,
+    boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
 {
   Info info(__FUNCTION__);
+  if (!e)
+  {
+    // The connection::async_write() function will automatically
+    // serialize the data structure for us.
+    connection_.async_write(NoJob,
+      boost::bind(&ShutdownWorkerOperation::handle_FinishOperation, this,
+      boost::asio::placeholders::error));
+  } else if (endpoint_iterator != boost::asio::ip::tcp::resolver::iterator()) {
+    // Try the next endpoint.
+    connection_.socket().close();
+    boost::asio::ip::tcp::endpoint endpoint = *endpoint_iterator;
+    connection_.socket().async_connect(endpoint,
+      boost::bind(&ShutdownWorkerOperation::handle_connect, this,
+      boost::asio::placeholders::error, ++endpoint_iterator));
+  } 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.
+    Exitflag = ErrorFlag;
+    ELOG(1, e.message());
+  }
+}
 
-  // send the NoJob
-  connection_.sync_write(NoJob);
-}

src/Fragmentation/Automation/Operations/Servers/ShutdownWorkerOperation.hpp

@@ -21 +21 @@
 
 #include "Jobs/FragmentJob.hpp"
-#include "Operations/SyncOperation.hpp"
+#include "Operations/AsyncOperation.hpp"
 
 /** Synchronous operation that gives shutdown command.
  *
  */
-class ShutdownWorkerOperation : public SyncOperation  {
+class ShutdownWorkerOperation : public AsyncOperation  {
 public:
   /// Constructor for class ShutdownWorkerOperation.
   ShutdownWorkerOperation(Connection &_connection) :
-    SyncOperation(std::string("shutdown"),_connection) {}
+    AsyncOperation(std::string("shutdown"),_connection) {}
   /// Destructor for class ShutdownWorkerOperation
   ~ShutdownWorkerOperation() {}
 
 public:
-  // function that implements read&writes in between connect/disconnect
-  virtual void internal();
+  // virtual function pointer to the connection handler
+  void handle_connect(const boost::system::error_code& e,
+      boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
 
 private: