Changeset 402bde for src/Fragmentation

Timestamp:

May 4, 2012, 2:19:07 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:

b9c486

Parents:

3c4a5e

git-author:

Frederik Heber <heber@…> (12/09/11 20:10:53)

git-committer:

Frederik Heber <heber@…> (05/04/12 14:19:07)

Message:

Placed initiating sockets from Cstor of FragmentScheduler into helper functions.

Location:

src/Fragmentation/Automation

Files:

• FragmentScheduler.cpp (modified) (3 diffs)
• FragmentScheduler.hpp (modified) (1 diff)

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -60 +60 @@
 {
   Info info(__FUNCTION__);
-  {
-    // Start an accept operation for worker connections.
-    connection_ptr new_conn(new Connection(worker_acceptor_.get_io_service()));
-    worker_acceptor_.async_accept(new_conn->socket(),
-      boost::bind(&FragmentScheduler::handle_AcceptWorker, this,
-        boost::asio::placeholders::error, new_conn));
-  }
-
-  {
-    // Start an accept operation for controller connection.
-    connection_ptr new_conn(new Connection(controller_acceptor_.get_io_service()));
-    controller_acceptor_.async_accept(new_conn->socket(),
-      boost::bind(&FragmentScheduler::handle_AcceptController, this,
-        boost::asio::placeholders::error, new_conn));
-  }
-}
+
+  initiateWorkerSocket();
+
+  initiateControllerSocket();
+}
+
+/** Internal function to start worker connection.
+ *
+ */
+void FragmentScheduler::initiateWorkerSocket()
+{
+  // Start an accept operation for worker connections.
+  connection_ptr new_conn(new Connection(worker_acceptor_.get_io_service()));
+  worker_acceptor_.async_accept(new_conn->socket(),
+    boost::bind(&FragmentScheduler::handle_AcceptWorker, this,
+      boost::asio::placeholders::error, new_conn));
+}
+
+/** Internal function to start controller connection.
+ *
+ */
+void FragmentScheduler::initiateControllerSocket()
+{
+  // Start an accept operation for controller connection.
+  connection_ptr new_conn(new Connection(controller_acceptor_.get_io_service()));
+  controller_acceptor_.async_accept(new_conn->socket(),
+    boost::bind(&FragmentScheduler::handle_AcceptController, this,
+      boost::asio::placeholders::error, new_conn));
+}
+
 
 /** Handle a new worker connection.
@@ -105 +119 @@
       // Start an accept operation for a new Connection only when there
       // are still jobs present otherwise we quit.
-      connection_ptr new_conn(new Connection(worker_acceptor_.get_io_service()));
-      worker_acceptor_.async_accept(new_conn->socket(),
-        boost::bind(&FragmentScheduler::handle_AcceptWorker, this,
-        boost::asio::placeholders::error, new_conn));
+      initiateWorkerSocket();
     } else {
       // send the static NoJob
@@ -229 +240 @@
   if (JobsQueue.isJobPresent()) {
     // Start an accept operation for a new Connection.
-    connection_ptr new_conn(new Connection(controller_acceptor_.get_io_service()));
-    controller_acceptor_.async_accept(new_conn->socket(),
-      boost::bind(&FragmentScheduler::handle_AcceptController, this,
-      boost::asio::placeholders::error, new_conn));
+    initiateControllerSocket();
   } else {
     LOG(1, "INFO: Shutting down controller socket.");

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -68 +68 @@
   void handle_CheckResultState(const boost::system::error_code& e, connection_ptr conn);
 
+  /// internal function to prepare worker connections
+  void initiateWorkerSocket();
+
+  /// internal function to prepare controller connections
+  void initiateControllerSocket();
+
+private:
   /// The acceptor object used to accept incoming worker socket connections.
   boost::asio::ip::tcp::acceptor worker_acceptor_;