Changeset 17017b for src/Fragmentation

Timestamp:

Jul 2, 2012, 8:32:07 AM (12 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:

9db22d

Parents:

e48f5c

git-author:

Frederik Heber <heber@…> (05/11/12 19:39:08)

git-committer:

Frederik Heber <heber@…> (07/02/12 08:32:07)

Message:

FragmentScheduler sends true or false instead of specific enumeration as acknowledge of enrollment.

• adapted EnrollInPoolOperation accordingly.

Location:

src/Fragmentation/Automation

Files:

• FragmentScheduler.cpp (modified) (2 diffs)
• Operations/Workers/EnrollInPoolOperation.cpp (modified) (2 diffs)
• Operations/Workers/EnrollInPoolOperation.hpp (modified) (2 diffs)

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -168 +168 @@
         if (pool.presentInPool(address)) {
           ELOG(1, "INFO: worker "+toString(address)+" is already contained in pool.");
-          enum EnrollInPoolOperation::EnrollFlag flag = EnrollInPoolOperation::Fail;
-          conn->async_write(flag,
+          conn->async_write(false,
             boost::bind(&FragmentScheduler::WorkerListener_t::handle_enrolled, this,
             boost::asio::placeholders::error, conn));
@@ -176 +175 @@
           LOG(1, "INFO: Adding " << address << " to pool ...");
           pool.addWorker(address);
-          enum EnrollInPoolOperation::EnrollFlag flag = EnrollInPoolOperation::Success;
-          conn->async_write(flag,
+          conn->async_write(true,
             boost::bind(&FragmentScheduler::WorkerListener_t::handle_enrolled, this,
             boost::asio::placeholders::error, conn));

src/Fragmentation/Automation/Operations/Workers/EnrollInPoolOperation.cpp

@@ -93 +93 @@
     // of jobs. The connection::async_read() function will automatically
     // decode the data that is read from the underlying socket.
-    connection_.async_read(flag,
+    connection_.async_read(EnrollmentFlag,
       boost::bind(&EnrollInPoolOperation::handle_FinishOperation, this,
       boost::asio::placeholders::error));
@@ -109 +109 @@
   Info info(__FUNCTION__);
 
-  if (flag == Success)
+  if (EnrollmentFlag)
     LOG(2, "DEBUG: Enrollment successful.");
   else

src/Fragmentation/Automation/Operations/Workers/EnrollInPoolOperation.hpp

@@ -32 +32 @@
     AsyncOperation(std::string("enrollinpool"),_connection),
     address(_address),
-    flag(Success)
+    EnrollmentFlag(false)
   {}
   /// Destructor for class EnrollInPoolOperation
   ~EnrollInPoolOperation() {}
-
-  enum EnrollFlag {
-    Success,
-    Fail
-  };
 
 protected:
@@ -60 +55 @@
   WorkerAddress address;
 
-  //!> flag returned by worker pool after enroll request
-  enum EnrollFlag flag;
+  //!> This flag indicates whether the server not only got out address but also returned something.
+  bool EnrollmentFlag;
 };