Changeset d1dbfc for src/Fragmentation/Automation/controller.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/controller.cpp (modified) (13 diffs)

src/Fragmentation/Automation/controller.cpp

@@ -39 +39 @@
 #include "Controller/FragmentController.hpp"
 #include "Controller/Commands/CheckResultsOperation.hpp"
+#include "Controller/Commands/GetNextJobIdOperation.hpp"
 #include "Controller/Commands/ReceiveJobsOperation.hpp"
 #include "Controller/Commands/SendResultsOperation.hpp"
 #include "Controller/Commands/ShutdownOperation.hpp"
-#include "GlobalJobId.hpp"
 #include "Jobs/MPQCCommandJob.hpp"
 #include "Jobs/SystemCommandJob.hpp"
@@ -56 +56 @@
 };
 
-// TODO: replace this instance by a IdPool owned by controller.
-GlobalJobId globalId;
-
-void createjobs(std::vector<FragmentJob::ptr> &jobs)
-{
-  FragmentJob::ptr testJob( new SystemCommandJob( std::string("cat"), std::string("Nothing"), globalId.getNextId()) );
-  FragmentJob::ptr othertestJob( new SystemCommandJob( std::string("cat"), std::string("Nothing"), globalId.getNextId()) );
+/** Requests an available id from server
+ *
+ * @param controller FragmentController with CommandRegistry
+ * @param host address of server
+ * @param service port/service of server
+ */
+void requestid(
+    FragmentController &controller,
+    const std::string &host,
+    const std::string &service)
+{
+  GetNextJobIdOperation *getnextid = static_cast<GetNextJobIdOperation *>(
+      controller.Commands.getByName("getnextjobid"));
+  (*getnextid)(host,service);
+}
+
+/** Returns another available id from a finished GetNextJobIdOperation.
+ *
+ * @param controller FragmentController with CommandRegistry
+ * @return next available id
+ */
+JobId_t getavailableid(FragmentController &controller)
+{
+  GetNextJobIdOperation *getnextid = static_cast<GetNextJobIdOperation *>(
+      controller.Commands.getByName("getnextjobid"));
+  const JobId_t nextid = getnextid->getNextId();
+  LOG(1, "INFO: Next available id is " << nextid << ".");
+  return nextid;
+}
+
+void createjobs(std::vector<FragmentJob::ptr> &jobs, const JobId_t nextid)
+{
+  FragmentJob::ptr testJob( new SystemCommandJob( std::string("cat"), std::string("Nothing"), nextid) );
   jobs.push_back(testJob);
-  jobs.push_back(othertestJob);
-}
-
-void parsejob(std::vector<FragmentJob::ptr> &jobs, const std::string &filename)
+  LOG(1, "INFO: Added one empty SystemCommandJob's.");
+}
+
+/** Creates a MPQCCommandJob with argument \a filename.
+ *
+ * @param jobs created job is added to this vector
+ * @param filename filename being argument to job
+ * @param nextid id for this job
+ */
+void parsejob(
+    std::vector<FragmentJob::ptr> &jobs,
+    const std::string &filename,
+    const JobId_t nextid)
 {
   std::ifstream file;
@@ -74 +109 @@
   std::string output((std::istreambuf_iterator<char>(file)),
       std::istreambuf_iterator<char>());
-  FragmentJob::ptr testJob( new MPQCCommandJob(output, globalId.getNextId()) );
+  FragmentJob::ptr testJob( new MPQCCommandJob(output, nextid) );
   jobs.push_back(testJob);
   file.close();
@@ -80 +115 @@
 }
 
-void addjobs(FragmentController &controller, std::vector<FragmentJob::ptr> &jobs)
+/** Adds a vector of jobs to the send operation.
+ *
+ * @param controller FragmentController with CommandRegistry
+ * @param jobs jobs to add
+ */
+void addjobs(
+    FragmentController &controller,
+    std::vector<FragmentJob::ptr> &jobs)
 {
   ReceiveJobsOperation *recjobs = static_cast<ReceiveJobsOperation *>(
@@ -87 +129 @@
 }
 
-void sendjobs(FragmentController &controller, const std::string &host, const std::string &service)
+/** Sends contained jobs in operation to server
+ *
+ * @param controller FragmentController with CommandRegistry
+ * @param host address of server
+ * @param service port/service of server
+ */
+void sendjobs(
+    FragmentController &controller,
+    const std::string &host,
+    const std::string &service)
 {
   ReceiveJobsOperation *recjobs = static_cast<ReceiveJobsOperation *>(
@@ -94 +145 @@
 }
 
-void checkresults(FragmentController &controller, const std::string &host, const std::string &service)
+/** Obtains scheduled and done jobs from server
+ *
+ * @param controller FragmentController with CommandRegistry
+ * @param host address of server
+ * @param service port/service of server
+ */
+void checkresults(
+    FragmentController &controller,
+    const std::string &host,
+    const std::string &service)
 {
   CheckResultsOperation *checkres = static_cast<CheckResultsOperation *>(
@@ -101 +161 @@
 }
 
+/** Prints scheduled and done jobs.
+ *
+ * @param controller FragmentController with CommandRegistry
+ */
 void printdonejobs(FragmentController &controller)
 {
@@ -110 +174 @@
 }
 
-void receiveresults(FragmentController &controller, const std::string &host, const std::string &service)
+/** Obtains results from done jobs from server.
+ *
+ * @param controller FragmentController with CommandRegistry
+ * @param host address of server
+ * @param service port/service of server
+ */
+void receiveresults(
+    FragmentController &controller,
+    const std::string &host,
+    const std::string &service)
 {
   SendResultsOperation *sendres = static_cast<SendResultsOperation *>(
@@ -117 +190 @@
 }
 
+/** Print received results.
+ *
+ * @param controller FragmentController with CommandRegistry
+ */
 void printreceivedresults(FragmentController &controller)
 {
@@ -127 +204 @@
 }
 
-void shutdown(FragmentController &controller, const std::string &host, const std::string &service)
+/** Sends shutdown signal to server
+ *
+ * @param controller FragmentController with CommandRegistry
+ * @param host address of server
+ * @param service port/service of server
+ */
+void shutdown(
+    FragmentController &controller,
+    const std::string &host,
+    const std::string &service)
 {
   ShutdownOperation *shutdown = static_cast<ShutdownOperation *>(
@@ -183 +269 @@
     FragmentController controller(io_service);
 
+    // Initial phase: information gathering from server
+
     switch(getCommandIndex(CommandsMap, argv[3])) {
       case AddJobsIndex:
       {
+        if (argc < 5) {
+          ELOG(1, "Please add a filename for the MPQCCommandJob.");
+        } else {
+          // get an id for every filename
+          for (int argcount = 4; argcount < argc; ++argcount) {
+            requestid(controller, argv[1], argv[2]);
+          }
+        }
+        break;
+      }
+      case CreateJobsIndex:
+      {
+        requestid(controller, argv[1], argv[2]);
+        break;
+      }
+      case CheckResultsIndex:
+        break;
+      case ReceiveResultsIndex:
+        break;
+      case ShutdownIndex:
+        break;
+      case UnknownCommandIndex:
+      default:
+        ELOG(1, "Unrecognized command '"+toString(argv[3])+"'.");
+        break;
+    }
+
+    {
+      io_service.reset();
+      Info info("io_service: Phase One");
+      io_service.run();
+    }
+
+    // Second phase: Building jobs and sending information to server
+
+    switch(getCommandIndex(CommandsMap, argv[3])) {
+      case AddJobsIndex:
+      {
         std::vector<FragmentJob::ptr> jobs;
-        if (argc == 4) {
+        if (argc < 5) {
           ELOG(1, "Please add a filename for the MPQCCommandJob.");
         } else {
           for (int argcount = 4; argcount < argc; ++argcount) {
-            LOG(1, "INFO: Parsing job for file " << argv[argcount] << ".");
-            parsejob(jobs, argv[argcount]);
+            const JobId_t next_id = getavailableid(controller);
+            const std::string filename(argv[argcount]);
+            LOG(1, "INFO: Creating MPQCCommandJob with filename'"
+                +filename+"', and id "+toString(next_id)+".");
+            parsejob(jobs, filename, next_id);
           }
           addjobs(controller, jobs);
@@ -202 +331 @@
       {
         std::vector<FragmentJob::ptr> jobs;
-        createjobs(jobs);
+          const JobId_t next_id = getavailableid(controller);
+          createjobs(jobs, next_id);
         addjobs(controller, jobs);
         sendjobs(controller, argv[1], argv[2]);
@@ -229 +359 @@
 
     {
-      Info info("io_service");
+      io_service.reset();
+      Info info("io_service: Phase Two");
       io_service.run();
     }
+
+    // Final phase: Print result of command
 
     switch(getCommandIndex(CommandsMap, argv[3])) {