Changeset 6f2bc7 for src

Timestamp:

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

d1dbfc

Parents:

bf56f6

git-author:

Frederik Heber <heber@…> (02/16/12 11:12:40)

git-committer:

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

Message:

CheckResultsOperation now receives both scheduled and done jobs.

Location:

src/Fragmentation/Automation

Files:

• Controller/Commands/CheckResultsOperation.cpp (modified) (5 diffs)
• Controller/Commands/CheckResultsOperation.hpp (modified) (3 diffs)
• FragmentScheduler.cpp (modified) (3 diffs)
• FragmentScheduler.hpp (modified) (1 diff)
• controller.cpp (modified) (1 diff)

src/Fragmentation/Automation/Controller/Commands/CheckResultsOperation.cpp

@@ -26 +26 @@
 #include <iostream>
 #include "Connection.hpp" // Must come before boost/serialization headers.
+#include <boost/serialization/vector.hpp>
 #include "CodePatterns/Info.hpp"
 #include "CodePatterns/Log.hpp"
@@ -46 +47 @@
     enum ControllerChoices choice = CheckState;
     connection_.async_write(choice,
-      boost::bind(&CheckResultsOperation::handle_ReceiveDoneJobs, this,
+      boost::bind(&CheckResultsOperation::handle_ReceiveJobInfo, this,
       boost::asio::placeholders::error));
   } else if (endpoint_iterator != boost::asio::ip::tcp::resolver::iterator()) {
@@ -68 +69 @@
  * \param e error code if something went wrong
  */
-void CheckResultsOperation::handle_ReceiveDoneJobs(const boost::system::error_code& e)
+void CheckResultsOperation::handle_ReceiveJobInfo(const boost::system::error_code& e)
 {
   Info info(__FUNCTION__);
@@ -75 +76 @@
     // The connection::async_read() function will automatically
     // decode the data that is written to the underlying socket.
-    LOG(1, "INFO: Checking number of done jobs ...");
-    connection_.async_read(doneJobs,
+    LOG(1, "INFO: Obtaining number of present and done jobs ...");
+    connection_.async_read(jobInfo,
       boost::bind(&Operation::handle_FinishOperation, this,
       boost::asio::placeholders::error));
@@ -88 +89 @@
 }
 
+/** Getter for jobInfo.
+ *
+ * \sa checkResults()
+ * \param number of present jobs
+ */
+size_t CheckResultsOperation::getPresentJobs() const
+{
+  ASSERT( jobInfo.size() == (size_t)2,
+      "CheckResultsOperation::getPresentJobs() - jobInfo does not contain present and done jobs.");
+  return jobInfo[0];
+}
+
+/** Getter for jobInfo.
+ *
+ * \sa checkResults()
+ * \param number of done jobs
+ */
+size_t CheckResultsOperation::getDoneJobs() const
+{
+  ASSERT( jobInfo.size() == (size_t)2,
+      "CheckResultsOperation::getPresentJobs() - jobInfo does not contain present and done jobs.");
+  return jobInfo[1];
+}
+

src/Fragmentation/Automation/Controller/Commands/CheckResultsOperation.hpp

@@ -21 +21 @@
 #include "Controller/Commands/Operation.hpp"
 
-
+/** This Operations requests number of present jobs and present results (done
+ * jobs) from the server.
+ *
+ */
 class CheckResultsOperation : public Operation  {
 public:
@@ -27 +30 @@
   CheckResultsOperation(Connection &_connection) :
     Operation(std::string("checkresults"), _connection),
-    doneJobs(0)
+    jobInfo((size_t)2, 0)
         {}
   /// Destructor for class CheckResultsOperation
@@ -38 +41 @@
 
   /// Callback function when doneJobs have been received.
-  void handle_ReceiveDoneJobs(const boost::system::error_code& e);
+  void handle_ReceiveJobInfo(const boost::system::error_code& e);
 
-  /** Getter for doneJobs.
-   *
-   * \sa checkResults()
-   * \param doneJobs
-   */
-  size_t getDoneJobs() const
-  {
-    return doneJobs;
-  }
+  /// Getter for presentJobs
+  size_t getPresentJobs() const;
+
+  /// Getter for doneJobs
+  size_t getDoneJobs() const;
 
 protected:
-  /// currently calculated results
-  size_t doneJobs;
+  /// current jobs left to calculate and currently calculated results
+  std::vector<size_t> jobInfo;
 };
 

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -66 +66 @@
   ),
   result( new FragmentResult(JobId::NoJob) ),
+  jobInfo((size_t)2, 0),
   choice(NoOperation),
   Exitflag(OkFlag)
@@ -259 +260 @@
     {
       // first update number
-      doneJobs = JobsQueue.getDoneJobs();
+      jobInfo[0] = JobsQueue.getPresentJobs();
+      jobInfo[1] = JobsQueue.getDoneJobs();
       // now we accept connections to check for state of calculations
-      LOG(1, "INFO: Sending state that "+toString(doneJobs)+" jobs are done to controller ...");
-      conn->async_write(doneJobs,
+      LOG(1, "INFO: Sending state that "+toString(jobInfo[0])+" jobs are present and "+toString(jobInfo[1])+" jobs are done to controller ...");
+      conn->async_write(jobInfo,
         boost::bind(&FragmentScheduler::handle_CheckResultState, this,
         boost::asio::placeholders::error, conn));
@@ -345 +347 @@
   Info info(__FUNCTION__);
   // do nothing
-  LOG(1, "INFO: Sent that " << doneJobs << " jobs are done.");
+  LOG(1, "INFO: Sent that " << jobInfo << " jobs are (scheduled, done).");
 }
 

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -97 +97 @@
   std::vector<FragmentJob::ptr> jobs;
 
-  /// number of jobs that are calculated, required for returning status
-  size_t doneJobs;
+  /// number of jobs that are waiting to be and are calculated, required for returning status
+  std::vector<size_t> jobInfo;
 
   // choice

src/Fragmentation/Automation/controller.cpp

@@ -106 +106 @@
       controller.Commands.getByName("checkresults"));
   const size_t doneJobs = checkres->getDoneJobs();
-  LOG(1, "INFO: " << doneJobs << " jobs are calculated so far.");
+  const size_t presentJobs = checkres->getPresentJobs();
+  LOG(1, "INFO: #" << presentJobs << " are waiting in the queue and #" << doneJobs << " jobs are calculated so far.");
 }