Changeset 3c4a5e for src/Fragmentation/Automation/FragmentScheduler.cpp

Timestamp:

May 4, 2012, 2:19:07 PM (14 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, Candidate_v1.7.0, Candidate_v1.7.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:

402bde

Parents:

db03d9

git-author:

Frederik Heber <heber@…> (12/09/11 17:11:55)

git-committer:

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

Message:

Added ResultChecker and capability to check on computed jobs.

• added handle_connect_check() to FragmentController.
• FragmentScheduler::handle_AcceptController() switches between _ReceiveJobs or _CheckResultState depending on present jobs and done jobs. We use FragmentQueue::getDoneJobs() to store number of jobs handling connect.
• TESTFIX: Enhanced regression test Fragmentation/Automation to use ResultChecker as well.

File:

• src/Fragmentation/Automation/FragmentScheduler.cpp (modified) (5 diffs)

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -125 +125 @@
     // accept operation the io_service will run out of work to do and the
     // server will exit.
+    Exitflag = WorkerErrorFlag;
     ELOG(0, e.message());
   }
@@ -184 +185 @@
   if (!e)
   {
-    if (jobs.empty()) {
+    if (JobsQueue.isJobPresent() || !JobsQueue.getDoneJobs()) {
       // The connection::async_write() function will automatically
       // serialize the data structure for us.
@@ -191 +192 @@
         boost::bind(&FragmentScheduler::handle_ReceiveJobs, this,
         boost::asio::placeholders::error, conn));
+    } else {
+      // we just give a status report ...
+      // first update number
+      doneJobs = JobsQueue.getDoneJobs();
+      // now we accept connections to check for state of calculations
+      LOG(1, "INFO: Sending state of results to controller ...");
+      conn->async_write(doneJobs,
+        boost::bind(&FragmentScheduler::handle_CheckResultState, this,
+        boost::asio::placeholders::error, conn));
     }
   }
@@ -198 +208 @@
     // accept operation the io_service will run out of work to do and the
     // server will exit.
-    Exitflag = ErrorFlag;
+    Exitflag = ControllerErrorFlag;
     ELOG(0, e.message());
   }
@@ -230 +240 @@
 }
 
+/** Controller callback function when checking on state of results.
+ *
+ * \param e error code if something went wrong
+ * \param conn reference with the connection
+ */
+void FragmentScheduler::handle_CheckResultState(const boost::system::error_code& e, connection_ptr conn)
+{
+  Info info(__FUNCTION__);
+  // do nothing
+  LOG(1, "INFO: Sent that " << doneJobs << " jobs are done.");
+}