Changeset 9948a7 for src/Fragmentation/Automation/Controller/Commands/ShutdownOperation.cpp

Timestamp:

May 17, 2012, 3:21:54 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:

96c83b

Parents:

d6fe76

git-author:

Frederik Heber <heber@…> (12/11/11 16:59:08)

git-committer:

Frederik Heber <heber@…> (05/17/12 15:21:54)

Message:

Operation::operator() now contains everything to get the endpoint and connect.

• getting the endpoint is placed in operator() which needs host and service as parameters.
• derived classes just implement handle_connect whose virtual function pointer is boost::bind in Operation::operator().
• this all makes it very easy to implement new commands for the Controller.
• all handle_connect_... of course are now the above implementation.
• all connect_... are now contained in Operation::operator(), hence have been removed.

File:

• src/Fragmentation/Automation/Controller/Commands/ShutdownOperation.cpp (modified) (4 diffs)

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

@@ -24 +24 @@
 
 #include <boost/bind.hpp>
-#include <boost/foreach.hpp>
 #include <iostream>
 #include "Connection.hpp" // Must come before boost/serialization headers.
@@ -38 +37 @@
  * \param endpoint_iterator endpoint of the connection
  */
-void ShutdownOperation::handle_connect_shutdown(const boost::system::error_code& e,
+void ShutdownOperation::handle_connect(const boost::system::error_code& e,
     boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
 {
@@ -54 +53 @@
     boost::asio::ip::tcp::endpoint endpoint = *endpoint_iterator;
     connection_.socket().async_connect(endpoint,
-      boost::bind(&ShutdownOperation::handle_connect_shutdown, this,
+      boost::bind(&ShutdownOperation::handle_connect, this,
       boost::asio::placeholders::error, ++endpoint_iterator));
   } else {
@@ -64 +63 @@
   }
 }
-
-/** Internal function to connect to the endpoint of the server asynchronuously.
- *
- * We require internal connetion_ and host and service to be set up for this.
- */
-void ShutdownOperation::connect_shutdown()
-{
-  Info info(__FUNCTION__);
-  // Resolve the host name into an IP address.
-  boost::asio::ip::tcp::resolver::iterator endpoint_iterator = getEndpointIterator();
-  boost::asio::ip::tcp::endpoint endpoint = *endpoint_iterator;
-
-  // Start an asynchronous connect operation.
-  std::cout << "Connecting to endpoint " << endpoint << " to get results " << std::endl;
-  connection_.socket().async_connect(endpoint,
-    boost::bind(&ShutdownOperation::handle_connect_shutdown, this,
-      boost::asio::placeholders::error, ++endpoint_iterator));
-}
-
-/** Function to initiate shutdown of server.
- *
- */
-void ShutdownOperation::operator()()
-{
-  // connect
-  connect_shutdown();
-  //disconnect
-  disconnect();
-}
-
-void ShutdownOperation::handle_connect(const boost::system::error_code& e,
-    boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
-{}