Changeset d1dbfc for src/Fragmentation/Automation/FragmentScheduler.cpp

Timestamp:

Jun 27, 2012, 4:07:20 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:

554809

Parents:

6f2bc7

git-author:

Frederik Heber <heber@…> (02/16/12 15:09:52)

git-committer:

Frederik Heber <heber@…> (06/27/12 16:07:20)

Message:

New GetNextJobIdOperation for obtaining next available JobId from server.

• as JobId is required to create the job, we now need two, separate communication phases: gathering info (ids) and sending info (jobs).
• new SchedulderState GetNextJobId along with handlers.
• new GetNextJobIdOperation that requests another id which is internally stored into a list, along with a getter that extracts them one by one.
• controller's createjobs() and parsejobs() each take an nextid parameter now.

File:

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

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -68 +68 @@
   jobInfo((size_t)2, 0),
   choice(NoOperation),
+  globalId(0),
   Exitflag(OkFlag)
 {
@@ -240 +241 @@
   {
     bool LaunchNewAcceptor = true;
+    LOG(1, "INFO: Received request for operation " << choice << ".");
     // switch over the desired choice read previously
     switch(choice) {
@@ -247 +249 @@
       break;
     }
+    case GetNextJobId:
+    {
+      const JobId_t nextid = globalId.getNextId();
+      LOG(1, "INFO: Sending next available job id " << nextid << " to controller ...");
+      conn->async_write(nextid,
+        boost::bind(&FragmentScheduler::handle_GetNextJobIdState, this,
+        boost::asio::placeholders::error, conn));
+      break;
+    }
     case ReceiveJobs:
-      {
-        // The connection::async_write() function will automatically
-        // serialize the data structure for us.
-        LOG(1, "INFO: Receiving bunch of jobs from a controller ...");
-        conn->async_read(jobs,
-          boost::bind(&FragmentScheduler::handle_ReceiveJobs, this,
-          boost::asio::placeholders::error, conn));
-        break;
-      }
+    {
+      // The connection::async_write() function will automatically
+      // serialize the data structure for us.
+      LOG(1, "INFO: Receiving bunch of jobs from a controller ...");
+      conn->async_read(jobs,
+        boost::bind(&FragmentScheduler::handle_ReceiveJobs, this,
+        boost::asio::placeholders::error, conn));
+      break;
+    }
     case CheckState:
     {
@@ -350 +361 @@
 }
 
+/** 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_GetNextJobIdState(const boost::system::error_code& e, connection_ptr conn)
+{
+  Info info(__FUNCTION__);
+  // do nothing
+  LOG(1, "INFO: Sent next available job id.");
+}
+
 /** Controller callback function when result has been received.
  *