Changeset 96c83b for src

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:

25b30aa

Parents:

9948a7

git-author:

Frederik Heber <heber@…> (12/11/11 17:14:24)

git-committer:

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

Message:

Neither FragmentController not Operation need host or service as params to Cstor anymore.

• due to the last change these are given directly to Operation::operator(), hence we have removed them from FragmentController's and Operation's cstor.
• removed Operation::getEndpointIterator().
• all small controller executables have been adapted accordingly.

Location:

src/Fragmentation/Automation/Controller

Files:

• Commands/CheckResultsOperation.hpp (modified) (1 diff)
• Commands/Operation.cpp (modified) (3 diffs)
• Commands/Operation.hpp (modified) (2 diffs)
• Commands/ReceiveJobsOperation.hpp (modified) (1 diff)
• Commands/SendResultsOperation.hpp (modified) (1 diff)
• Commands/ShutdownOperation.hpp (modified) (1 diff)
• FragmentController.cpp (modified) (1 diff)
• FragmentController.hpp (modified) (1 diff)
• JobAdder.cpp (modified) (1 diff)
• ResultChecker.cpp (modified) (1 diff)
• ResultGetter.cpp (modified) (1 diff)
• Shutdowner.cpp (modified) (1 diff)

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

@@ -25 +25 @@
 public:
   /// Constructor for class CheckResultsOperation.
-  CheckResultsOperation(Connection &_connection, const std::string& _host, const std::string& _service) :
-    Operation(_connection, _host, _service),
+  CheckResultsOperation(Connection &_connection) :
+    Operation(_connection),
     doneJobs(0)
-  {}
+        {}
   /// Destructor for class CheckResultsOperation
   ~CheckResultsOperation() {}

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

@@ -38 +38 @@
  * \param _connection connection to operate on
  */
-Operation::Operation(Connection &_connection, const std::string& _host, const std::string& _service) :
+Operation::Operation(Connection &_connection) :
     connection_(_connection),
-    host(_host),
-    service(_service),
     Exitflag(OkFlag)
 {}
@@ -73 +71 @@
 }
 
-/** Internal function to resolve all possible connection endpoints.
- *
- * \return endpoint iterator of connection
- */
-boost::asio::ip::tcp::resolver::iterator Operation::getEndpointIterator()
-{
-  // Resolve the host name into an IP address.
-  boost::asio::ip::tcp::resolver resolver(connection_.socket().get_io_service());
-  boost::asio::ip::tcp::resolver::query query(host, service);
-  boost::asio::ip::tcp::resolver::iterator endpoint_iterator =
-    resolver.resolve(query);
-
-  return endpoint_iterator;
-}
-
 /** Internal function to disconnect connection_ correctly.
  *
@@ -93 +76 @@
 void Operation::disconnect()
 {
-  //connection_.socket().close();
+  connection_.socket().close();
 }
 

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

@@ -22 +22 @@
 class Operation {
 public:
-  Operation(Connection &_connection, const std::string& _host, const std::string& _service);
+  Operation(Connection &_connection);
   virtual ~Operation();
 public:
@@ -53 +53 @@
 
 protected:
-  /// internal function to resolve host name and ip address
-  boost::asio::ip::tcp::resolver::iterator getEndpointIterator();
-
   /// internal function to disconnect from server
   void disconnect();
-
-protected:
-  /// host name of server
-  const std::string host;
-
-  // service to connect to to
-  const std::string service;
 
   // exit flag of this operation

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

@@ -26 +26 @@
 public:
   /// Constructor for class ReceiveJobsOperation.
-  ReceiveJobsOperation(Connection &_connection, const std::string& _host, const std::string& _service) :
-    Operation(_connection, _host, _service) {}
+  ReceiveJobsOperation(Connection &_connection) :
+    Operation(_connection) {}
   /// Destructor for class ReceiveJobsOperation
   ~ReceiveJobsOperation() {}

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

@@ -26 +26 @@
 public:
   /// Constructor for class SendResultsOperation.
-  SendResultsOperation(Connection &_connection, const std::string& _host, const std::string& _service) :
-    Operation(_connection, _host, _service) {}
+  SendResultsOperation(Connection &_connection) :
+    Operation(_connection) {}
   /// Destructor for class SendResultsOperation
   ~SendResultsOperation() {}

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

@@ -25 +25 @@
 public:
   /// Constructor for class ShutdownOperation.
-  ShutdownOperation(Connection &_connection, const std::string& _host, const std::string& _service) :
-    Operation(_connection, _host, _service) {}
+  ShutdownOperation(Connection &_connection) :
+    Operation(_connection) {}
   /// Destructor for class ShutdownOperation
   ~ShutdownOperation() {}

src/Fragmentation/Automation/Controller/FragmentController.cpp

@@ -37 +37 @@
  */
 FragmentController::FragmentController(
-    boost::asio::io_service& io_service,
-    const std::string& _host,
-    const std::string& _service) :
+    boost::asio::io_service& io_service) :
     connection_(io_service),
-    recjobs(connection_, _host, _service),
-    checkres(connection_, _host, _service),
-    sendres(connection_, _host, _service),
-    shutdown(connection_, _host, _service)
+    recjobs(connection_),
+    checkres(connection_),
+    sendres(connection_),
+    shutdown(connection_)
 {
   Info info(__FUNCTION__);

src/Fragmentation/Automation/Controller/FragmentController.hpp

@@ -40 +40 @@
 {
 public:
-  FragmentController(boost::asio::io_service& io_service, const std::string& _host, const std::string& _service);
+  FragmentController(boost::asio::io_service& io_service);
   ~FragmentController();
 

src/Fragmentation/Automation/Controller/JobAdder.cpp

@@ -58 +58 @@
     const int NoJobs = boost::lexical_cast<int>(argv[3]);
     boost::asio::io_service io_service;
-    FragmentController controller(io_service, argv[1], argv[2]);
+    FragmentController controller(io_service);
 
     LOG(1, "INFO: Creating " << NoJobs << " jobs for the server.");

src/Fragmentation/Automation/Controller/ResultChecker.cpp

@@ -57 +57 @@
 
     boost::asio::io_service io_service;
-    FragmentController controller(io_service, argv[1], argv[2]);
+    FragmentController controller(io_service);
 
     controller.checkres(argv[1], argv[2]);

src/Fragmentation/Automation/Controller/ResultGetter.cpp

@@ -57 +57 @@
 
     boost::asio::io_service io_service;
-    FragmentController controller(io_service, argv[1], argv[2]);
+    FragmentController controller(io_service);
 
     std::vector<FragmentJob> jobs;

src/Fragmentation/Automation/Controller/Shutdowner.cpp

@@ -57 +57 @@
 
     boost::asio::io_service io_service;
-    FragmentController controller(io_service, argv[1], argv[2]);
+    FragmentController controller(io_service);
 
     controller.shutdown(argv[1], argv[2]);