Changeset 083490 for src

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:

2445fb

Parents:

ef2767

git-author:

Frederik Heber <heber@…> (11/27/11 19:03:10)

git-committer:

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

Message:

Renamed default handle_..() functions of FragmentSchedulder and ...Worker.

• new names resemble in what context they appear (i.e. at the end of what operation they are called).

Location:

src/Fragmentation/Automation

Files:

• FragmentScheduler.cpp (modified) (4 diffs)
• FragmentScheduler.hpp (modified) (1 diff)
• FragmentWorker.cpp (modified) (5 diffs)
• FragmentWorker.hpp (modified) (1 diff)

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -73 +73 @@
       LOG(1, "INFO: Sending job #" << job.getId() << ".");
       conn->async_write(job,
-        boost::bind(&FragmentScheduler::handle_write, this,
+        boost::bind(&FragmentScheduler::handle_SendJob, this,
         boost::asio::placeholders::error, conn));
 
@@ -85 +85 @@
       // send the static NoJob
       conn->async_write(NoJob,
-        boost::bind(&FragmentScheduler::handle_write, this,
+        boost::bind(&FragmentScheduler::handle_SendJob, this,
         boost::asio::placeholders::error, conn));
 
@@ -102 +102 @@
 }
 
-/// Handle completion of a write operation.
-void FragmentScheduler::handle_write(const boost::system::error_code& e, connection_ptr conn)
+/// Callback function when job has been sent.
+void FragmentScheduler::handle_SendJob(const boost::system::error_code& e, connection_ptr conn)
 {
     Info info(__FUNCTION__);
@@ -110 +110 @@
     LOG(1, "INFO: Receiving result for a job ...");
     conn->async_read(result,
-      boost::bind(&FragmentScheduler::handle_read, this,
+      boost::bind(&FragmentScheduler::handle_ReceiveResult, this,
       boost::asio::placeholders::error, conn));
 }
 
-/// Handle completion of a read operation.
-void FragmentScheduler::handle_read(const boost::system::error_code& e, connection_ptr conn)
+/// Callback function when result has been received.
+void FragmentScheduler::handle_ReceiveResult(const boost::system::error_code& e, connection_ptr conn)
 {
     Info info(__FUNCTION__);

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -35 +35 @@
   void handle_accept(const boost::system::error_code& e, connection_ptr conn);
 
-  /// Handle completion of a write operation.
-  void handle_write(const boost::system::error_code& e, connection_ptr conn);
+  /// Callback function when job has been sent.
+  void handle_SendJob(const boost::system::error_code& e, connection_ptr conn);
 
-  /// Handle completion of a read operation.
-  void handle_read(const boost::system::error_code& e, connection_ptr conn);
+  /// Callback function when result has been received.
+  void handle_ReceiveResult(const boost::system::error_code& e, connection_ptr conn);
 
 private:

src/Fragmentation/Automation/FragmentWorker.cpp

@@ -75 +75 @@
     LOG(1, "INFO: Receiving a job ...");
     connection_.async_read(job,
-      boost::bind(&FragmentWorker::handle_read, this,
+      boost::bind(&FragmentWorker::handle_ReceiveJob, this,
       boost::asio::placeholders::error));
   } else if (endpoint_iterator != boost::asio::ip::tcp::resolver::iterator()) {
@@ -93 +93 @@
 }
 
-/// Handle completion of a read operation.
-void FragmentWorker::handle_read(const boost::system::error_code& e)
+/// Callback function when job has been received.
+void FragmentWorker::handle_ReceiveJob(const boost::system::error_code& e)
 {
   Info info(__FUNCTION__);
@@ -112 +112 @@
       LOG(1, "INFO: Sending result for job #" << job.getId() << " ...");
       connection_.async_write(result,
-        boost::bind(&FragmentWorker::handle_write, this,
+        boost::bind(&FragmentWorker::handle_SendResult, this,
         boost::asio::placeholders::error));
 
@@ -120 +120 @@
       LOG(1, "INFO: Sending empty result ...");
       connection_.async_write(EmptyResult,
-        boost::bind(&FragmentWorker::handle_write, this,
+        boost::bind(&FragmentWorker::handle_SendResult, this,
         boost::asio::placeholders::error));
       Exitflag = NoJobFlag;
@@ -136 +136 @@
 }
 
-/// Handle completion of a write operation.
-void FragmentWorker::handle_write(const boost::system::error_code& e)
+/// Callback function when result has been sent.
+void FragmentWorker::handle_SendResult(const boost::system::error_code& e)
 {
   Info info(__FUNCTION__);

src/Fragmentation/Automation/FragmentWorker.hpp

@@ -33 +33 @@
       boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
 
-  /// Handle completion of a read operation.
-  void handle_read(const boost::system::error_code& e);
+  /// Callback function when job has been received.
+  void handle_ReceiveJob(const boost::system::error_code& e);
 
-  /// Handle completion of a write operation.
-  void handle_write(const boost::system::error_code& e);
+  /// Callback function when result has been sent.
+  void handle_SendResult(const boost::system::error_code& e);
 
   enum Exitflag_t {