Changeset 701bbc for src

Timestamp:

Jun 29, 2012, 8:01:46 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:

a8f54b6

Parents:

7dd8bc

git-author:

Frederik Heber <heber@…> (03/04/12 15:59:32)

git-committer:

Frederik Heber <heber@…> (06/29/12 08:01:46)

Message:

Added SyncOperation and common base Operation.

• CommandRegistry stores again Operation which is now the common base class of Async- and SyncOperation.
• ShutdownOperation is now a SyncOperation.

Location:

src/Fragmentation/Automation

Files:

• Controller/CommandRegistry.cpp (modified) (1 diff)
• Controller/CommandRegistry.hpp (modified) (1 diff)
• Controller/Commands/AsyncOperation.cpp (modified) (2 diffs)
• Controller/Commands/AsyncOperation.hpp (modified) (2 diffs)
• Controller/Commands/Operation.hpp (added)
• Controller/Commands/ShutdownOperation.cpp (modified) (1 diff)
• Controller/Commands/ShutdownOperation.hpp (modified) (1 diff)
• Controller/Commands/SyncOperation.cpp (added)
• Controller/Commands/SyncOperation.hpp (added)
• Makefile.am (modified) (2 diffs)

src/Fragmentation/Automation/Controller/CommandRegistry.cpp

@@ -34 +34 @@
 {}
 
-CONSTRUCT_REGISTRY(AsyncOperation)
+CONSTRUCT_REGISTRY(Operation)

src/Fragmentation/Automation/Controller/CommandRegistry.hpp

@@ -14 +14 @@
 #endif
 
-#include "Controller/Commands/AsyncOperation.hpp"
+#include "Controller/Commands/Operation.hpp"
 #include "CodePatterns/Registry.hpp"
 
-class CommandRegistry : public Registry<AsyncOperation>
+class CommandRegistry : public Registry<Operation>
 {
 public:

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

@@ -31 +31 @@
 
 #include "Controller/Commands/AsyncOperation.hpp"
-
-
-/** Constructor for class AsyncOperation.
- *
- * \param _name name for this Operation for retrieval from a registry
- * \param _connection connection to operate on
- */
-AsyncOperation::AsyncOperation(const std::string &_name, Connection &_connection) :
-    connection_(_connection),
-    name(_name),
-    Exitflag(OkFlag)
-{}
-
-/** Destructor for class AsyncOperation.
- *
- */
-AsyncOperation::~AsyncOperation()
-{}
 
 /** Callback function when an operation has been completed.
@@ -97 +79 @@
       boost::asio::placeholders::error, ++endpoint_iterator));
 }
+

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

@@ -18 +18 @@
 #include <vector>
 
-#include "Connection.hpp"
+#include "Operation.hpp"
 
-class AsyncOperation {
+class AsyncOperation : public Operation {
 public:
-  AsyncOperation(const std::string &_name, Connection &_connection);
-  virtual ~AsyncOperation();
+  /** Constructor for class AsyncOperation.
+   *
+   * \param _name name for this AsyncOperation for retrieval from a registry
+   * \param _connection connection to operate on
+   */
+  AsyncOperation(const std::string &_name, Connection &_connection) :
+    Operation(_name, _connection)
+  {}
+
+  /** Destructor for class AsyncOperation.
+   *
+   */
+  virtual ~AsyncOperation()
+  {}
+
 public:
-  /// The Connection to the server.
-  Connection &connection_;
-
   // virtual function pointer to the operation to do
   void operator()(const std::string& _host, const std::string& _service);
 
+protected:
   // virtual function pointer to the connection handler
   virtual void handle_connect(const boost::system::error_code& e,
@@ -38 +49 @@
   void handle_FinishOperation(const boost::system::error_code& e);
 
-  enum Exitflag_t {
-    OkFlag = 0,
-    ErrorFlag = 255
-  };
-
-  /** Getter for Exitflag.
-   *
-   * @return Exitflag
-   */
-  size_t getExitflag() const
-  {
-    return Exitflag;
-  }
-
-  std::string getName() const {
-    return name;
-  }
-
-private:
-  /// Name of this Operation (required for Registry pattern)
-  std::string name;
-
 protected:
   /// internal function to disconnect from server
   void disconnect();
-
-  // exit flag of this operation
-  enum Exitflag_t Exitflag;
 };
 

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

@@ -27 +27 @@
 #include "Connection.hpp" // Must come before boost/serialization headers.
 #include "CodePatterns/Info.hpp"
-#include "CodePatterns/Log.hpp"
 #include "ControllerChoices.hpp"
 
 #include "Controller/Commands/ShutdownOperation.hpp"
 
-/** Handle connect operation to shutdown scheduler.
+/** Virtual internal function to give shutdown choice.
  *
- * \param e error code if something went wrong
- * \param endpoint_iterator endpoint of the connection
  */
-void ShutdownOperation::handle_connect(const boost::system::error_code& e,
-    boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
+void ShutdownOperation::internal()
 {
   Info info(__FUNCTION__);
-  if (!e)
-  {
-    // Successfully established connection. Give choice.
-    enum ControllerChoices choice = ShutdownControllerSocket;
-    connection_.async_write(choice,
-      boost::bind(&ShutdownOperation::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(&ShutdownOperation::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());
-  }
+  enum ControllerChoices choice = ShutdownControllerSocket;
+  connection_.sync_write(choice);
 }
+

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

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

src/Fragmentation/Automation/Makefile.am

@@ -52 +52 @@
   Controller/Commands/SendResultsOperation.cpp \
   Controller/Commands/ShutdownOperation.cpp \
-  Controller/Commands/SubmitResultOperation.cpp
+  Controller/Commands/SubmitResultOperation.cpp \
+  Controller/Commands/SyncOperation.cpp
 
 FRAGMENTATIONCOMMANDSHEADER = \
@@ -61 +62 @@
   Controller/Commands/GetNextJobIdOperation.hpp \
   Controller/Commands/ObtainJobOperation.hpp \
+  Controller/Commands/Operation.hpp \
   Controller/Commands/ReceiveJobsOperation.hpp \
   Controller/Commands/SendJobToWorkerOperation.hpp \
   Controller/Commands/SendResultsOperation.hpp \
   Controller/Commands/ShutdownOperation.hpp \
-  Controller/Commands/SubmitResultOperation.hpp
+  Controller/Commands/SubmitResultOperation.hpp \
+  Controller/Commands/SyncOperation.hpp
 
 noinst_LTLIBRARIES += libMolecuilderFragmentationCommands.la