Changeset bff93d for src

Timestamp:

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

122de0

Parents:

d57585

git-author:

Frederik Heber <heber@…> (05/11/12 20:00:28)

git-committer:

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

Message:

RemoveFromPoolOperation is now async.

• changed PoolWorker such that we close down socket and listener via success callback handler of the operartion.
• FragmentScheduler now sends true/false as status of removal.

Location:

src/Fragmentation/Automation

Files:

• FragmentScheduler.cpp (modified) (2 diffs)
• FragmentScheduler.hpp (modified) (1 diff)
• Operations/Workers/RemoveFromPoolOperation.cpp (modified) (1 diff)
• Operations/Workers/RemoveFromPoolOperation.hpp (modified) (2 diffs)
• Pool/PoolWorker.cpp (modified) (5 diffs)
• Pool/PoolWorker.hpp (modified) (2 diffs)

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -205 +205 @@
       {
         if (pool.presentInPool(address)) {
-          // removing present worker
-          pool.removeWorker(address);
+          conn->async_write(true,
+            boost::bind(&FragmentScheduler::WorkerListener_t::handle_removed, this,
+            boost::asio::placeholders::error, conn));
         } else {
           ELOG(1, "Shutting down Worker " << address << " not contained in pool.");
+          conn->async_write(false,
+            boost::bind(&FragmentScheduler::WorkerListener_t::handle_removed, this,
+            boost::asio::placeholders::error, conn));
         }
         break;
@@ -255 +259 @@
 }
 
+/** Callback function when new worker has enrolled.
+ *
+ * \param e error code if something went wrong
+ * \param conn reference with the connection
+ */
+void FragmentScheduler::WorkerListener_t::handle_removed(const boost::system::error_code& e, connection_ptr conn)
+{
+  Info info(__FUNCTION__);
+  if (!e)  {
+    // removing present worker
+    pool.removeWorker(address);
+  } else {
+    // An error occurred. Log it and return. Since we are not starting a new
+    // accept operation the io_service will run out of work to do and the
+    // server will exit.
+    Exitflag = ErrorFlag;
+    ELOG(0, e.message());
+  }
+}
+
 /** Callback function when result has been received.
  *

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -94 +94 @@
     void handle_enrolled(const boost::system::error_code& e, connection_ptr conn);
 
+    /// Worker callback function when worker has been informed of successful removal.
+    void handle_removed(const boost::system::error_code& e, connection_ptr conn);
+
     /// Worker callback function when result has been received.
     void handle_ReceiveResultFromWorker(const boost::system::error_code& e, connection_ptr conn);

src/Fragmentation/Automation/Operations/Workers/RemoveFromPoolOperation.cpp

@@ -33 +33 @@
 
 
-/** Internal operation after connect to give address and send remove signal
- *
- */
-void RemoveFromPoolOperation::internal()
+/// Handle completion of a connect operation.
+void RemoveFromPoolOperation::handle_connect(const boost::system::error_code& e,
+    boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
+{
+  Info info(__FUNCTION__);
+  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 address " << address << " ...");
+    connection_.async_write(address,
+      boost::bind(&RemoveFromPoolOperation::handle_SendChoice, 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(&RemoveFromPoolOperation::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.
+    ELOG(1, e.message());
+    AsyncOperation::handle_FinishOperation(e);
+  }
+}
+
+/// Callback function when address has been sent and result is about to
+void RemoveFromPoolOperation::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_write() function will automatically
+    // decode the data that is read from the underlying socket.
+    enum WorkerChoices choice = RemoveFromPool;
+    connection_.async_write(choice,
+      boost::bind(&RemoveFromPoolOperation::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());
+    AsyncOperation::handle_FinishOperation(e);
+  }
+}
+
+/// Callback function when address has been sent and result is about to
+void RemoveFromPoolOperation::handle_ReceiveFlag(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_write() function will automatically
+    // decode the data that is read from the underlying socket.
+    connection_.async_read(RemovalFlag,
+      boost::bind(&RemoveFromPoolOperation::handle_FinishOperation, 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());
+    AsyncOperation::handle_FinishOperation(e);
+  }
+}
+
+/// Callback function when result has been sent.
+void RemoveFromPoolOperation::handle_FinishOperation(const boost::system::error_code& e)
 {
   Info info(__FUNCTION__);
 
-  LOG(1, "INFO: Removing " << address << " from server's pool ...");
-  connection_.sync_write(address);
-  enum WorkerChoices choice = RemoveFromPool;
-  connection_.sync_write(choice);
+  if (RemovalFlag)
+    LOG(1, "INFO: Removal successful.");
+  else
+    ELOG(1, "INFO: Removal failed.");
+
+  AsyncOperation::handle_FinishOperation(e);
 }

src/Fragmentation/Automation/Operations/Workers/RemoveFromPoolOperation.hpp

@@ -20 +20 @@
 #include "Connection.hpp"
 
-#include "Operations/SyncOperation.hpp"
+#include "Operations/AsyncOperation.hpp"
 #include "WorkerAddress.hpp"
 
-class RemoveFromPoolOperation : public SyncOperation  {
+class RemoveFromPoolOperation : public AsyncOperation  {
 public:
   /// Constructor for class RemoveFromPoolOperation.
-  RemoveFromPoolOperation(Connection &_connection, const WorkerAddress &_address) :
-    SyncOperation(std::string("shutdownworker"),_connection),
+  RemoveFromPoolOperation(Connection &_connection, const WorkerAddress &_address,
+      const boost::function<void ()> &_callback_on_success = NoOpCallback,
+      const boost::function<void ()> &_callback_on_failure = NoOpCallback) :
+    AsyncOperation(std::string("shutdownworker"),_connection, _callback_on_success, _callback_on_failure),
     address(_address)
   {}
@@ -34 +36 @@
 
 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);
+
+  /// Callback function when address has been sent and we ask for removal
+  void handle_SendChoice(const boost::system::error_code& e);
+
+  /// Callback function when receiving flag indication succesful removal
+  void handle_ReceiveFlag(const boost::system::error_code& e);
+
+  /// Callback function when op is finished.
+  void handle_FinishOperation(const boost::system::error_code& e);
 
 private:
   //!> address to enroll with
   WorkerAddress address;
+
+  //!> flag indication successful removal from server
+  bool RemovalFlag;
 };
 

src/Fragmentation/Automation/Pool/PoolWorker.cpp

@@ -69 +69 @@
   connection_(_io_service),
   failed(boost::bind(&ExitflagContainer::setExitflag, this, ExitflagContainer::ErrorFlag)),
+  closingdown(boost::bind(&PoolWorker::finish, this)),
   enrollOp(connection_, address, AsyncOperation::NoOpCallback, failed),
   submitOp(connection_, address, AsyncOperation::NoOpCallback, failed),
@@ -74 +75 @@
       boost::ref(submitOp),
       _host, _service)),
-  removeOp(connection_, address),
-  removeme(boost::bind(&SyncOperation::operator(),
+  removeOp(connection_, address, closingdown, failed),
+  removeme(boost::bind(&AsyncOperation::operator(),
       boost::ref(removeOp),
       _host, _service))
@@ -168 +169 @@
  *
  * Note that we will use ShutdownWorkerOperation to unlist from server's pool.
+ * We stop the io_service via its callback handler in case of success.
  */
 void PoolWorker::shutdown()
@@ -173 +175 @@
   // remove us from pool
   removeme();
+}
 
+/** Helper function to close down listener and stop service.
+ *
+ * This is called after we have been removed from server's pool
+ *
+ */
+void PoolWorker::finish()
+{
   // somehow stop listener
   PoolListener.closeSocket();
@@ -180 +190 @@
   io_service.stop();
 }
+

src/Fragmentation/Automation/Pool/PoolWorker.hpp

@@ -59 +59 @@
   void shutdown(int sig);
   void shutdown();
+  void finish();
 
   class PoolListener_t : public Listener
@@ -103 +104 @@
   boost::function<void ()> failed;
 
+  //!> internally bound function that sets the Exitflag to ErrorFlag
+  const boost::function<void ()> closingdown;
+
   //!> operation that handles obtaining a job
   EnrollInPoolOperation enrollOp;