Changeset c4f43e for src/Fragmentation

Timestamp:

Jul 2, 2012, 7:54:13 AM (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:

917be8

Parents:

e11611

git-author:

Frederik Heber <heber@…> (04/19/12 21:06:07)

git-committer:

Frederik Heber <heber@…> (07/02/12 07:54:13)

Message:

GetNextJobIdOperation now may request a vector of ids.

• otherwise we needed multiple phase one calls, ever requesting a single id.
• now, we state how many ids we want and may eventually get one by one as desired.
• adapted FragmentScheduler::ControllerListener_t and FragmentController accordingly as we now have to exchange the desired number of ids, too.
• requestid() needs now an additional parameter.

Location:

src/Fragmentation/Automation

Files:

• FragmentController.cpp (modified) (1 diff)
• FragmentController.hpp (modified) (1 diff)
• FragmentScheduler.cpp (modified) (3 diffs)
• FragmentScheduler.hpp (modified) (2 diffs)
• Operations/Controllers/GetNextJobIdOperation.cpp (modified) (4 diffs)
• Operations/Controllers/GetNextJobIdOperation.hpp (modified) (3 diffs)
• controller.cpp (modified) (2 diffs)

src/Fragmentation/Automation/FragmentController.cpp

@@ -86 +86 @@
  * @param host address of server
  * @param service port/service of server
- */
-void FragmentController::requestId(
-                const std::string &host,
-                const std::string &service)
+ * @param NumberIds number of desired ids to request with this connect
+ */
+void FragmentController::requestIds(
+                const std::string &host,
+                const std::string &service,
+                const size_t NumberIds)
 {
   GetNextJobIdOperation *getnextid = static_cast<GetNextJobIdOperation *>(
                 Commands.getByName("getnextjobid"));
+  (*getnextid).setDesiredIds(NumberIds);
   (*getnextid)(host,service);
 }

src/Fragmentation/Automation/FragmentController.hpp

@@ -43 +43 @@
   size_t getExitflag() const;
 
-  void requestId(const std::string &host, const std::string &service);
+  void requestIds(const std::string &host, const std::string &service, const size_t NumberIds);
   JobId_t getAvailableId();
   void addJobs(std::vector<FragmentJob::ptr> &jobs);

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -26 +26 @@
 #include "CodePatterns/MemDebug.hpp"
 
+#include <algorithm>
 #include <boost/bind.hpp>
 #include <boost/lexical_cast.hpp>
@@ -345 +346 @@
     case GetNextJobId:
     {
-      const JobId_t nextid = globalId.getNextId();
-      LOG(1, "INFO: Sending next available job id " << nextid << " to controller ...");
-      conn->async_write(nextid,
+      LOG(1, "INFO: Receiving number of desired job ids from controller ...");
+      conn->async_read(NumberIds,
         boost::bind(&FragmentScheduler::ControllerListener_t::handle_GetNextJobIdState, this,
         boost::asio::placeholders::error, conn));
@@ -462 +462 @@
 {
   Info info(__FUNCTION__);
+
+  std::vector<JobId_t> nextids( NumberIds, JobId::IllegalJob);
+  std::generate(nextids.begin(), nextids.end(),
+      boost::bind(&GlobalJobId::getNextId, boost::ref(globalId)));
+  LOG(1, "INFO: Sending next available job ids " << nextids << " to controller ...");
+  conn->async_write(nextids,
+    boost::bind(&FragmentScheduler::ControllerListener_t::handle_SendIds, this,
+    boost::asio::placeholders::error, conn));
+}
+
+/** Controller callback function when free job ids have been sent.
+ *
+ * \param e error code if something went wrong
+ * \param conn reference with the connection
+ */
+void FragmentScheduler::ControllerListener_t::handle_SendIds(const boost::system::error_code& e, connection_ptr conn)
+{
+  Info info(__FUNCTION__);
   // do nothing
-  LOG(1, "INFO: Sent next available job id.");
+  LOG(1, "INFO: Ids have been sent.");
 }
 

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -147 +147 @@
     void handle_GetNextJobIdState(const boost::system::error_code& e, connection_ptr conn);
 
+    /// Controller callback function when free job ids have been sent.
+    void handle_SendIds(const boost::system::error_code& e, connection_ptr conn);
+
     /// Controller callback function when result has been received.
     void handle_SendResults(const boost::system::error_code& e, connection_ptr conn);
@@ -159 +162 @@
     //!> number of jobs that are waiting to be and are calculated, required for returning status
     std::vector<size_t> jobInfo;
+
+    //!> number of job ids request from controller;
+    size_t NumberIds;
 
     //!> choice

src/Fragmentation/Automation/Operations/Controllers/GetNextJobIdOperation.cpp

@@ -46 +46 @@
   {
     // Successfully established connection. Give choice.
-          enum ControllerChoices choice = GetNextJobId;
+    enum ControllerChoices choice = GetNextJobId;
     connection_.async_write(choice,
-      boost::bind(&GetNextJobIdOperation::handle_ReceiveNextId, this,
+      boost::bind(&GetNextJobIdOperation::handle_SendNumberIds, this,
       boost::asio::placeholders::error));
   } else if (endpoint_iterator != boost::asio::ip::tcp::resolver::iterator()) {
@@ -65 +65 @@
 }
 
-/** Callback function when doneJobs have been received.
+/** Callback function when sending number of desired job ids.
  *
  * \param e error code if something went wrong
  */
-void GetNextJobIdOperation::handle_ReceiveNextId(const boost::system::error_code& e)
+void GetNextJobIdOperation::handle_SendNumberIds(const boost::system::error_code& e)
 {
   Info info(__FUNCTION__);
@@ -76 +76 @@
     // The connection::async_read() function will automatically
     // decode the data that is written to the underlying socket.
-    LOG(1, "INFO: Obtaining next available job id ...");
-    connection_.async_read(nextid,
+    LOG(1, "INFO: Requesting " << NumberIds <<  " ids  ...");
+    connection_.async_write(NumberIds,
+      boost::bind(&GetNextJobIdOperation::handle_ReceiveNextIds, this,
+      boost::asio::placeholders::error));
+  }
+  else
+  {
+    // An error occurred.
+    ELOG(1, e.message());
+  }
+}
+
+/** Callback function when doneJobs have been received.
+ *
+ * \param e error code if something went wrong
+ */
+void GetNextJobIdOperation::handle_ReceiveNextIds(const boost::system::error_code& e)
+{
+  Info info(__FUNCTION__);
+  if (!e)
+  {
+    // The connection::async_read() function will automatically
+    // decode the data that is written to the underlying socket.
+    LOG(1, "INFO: Obtaining a bunch of available job ids ...");
+    connection_.async_read(ids,
       boost::bind(&GetNextJobIdOperation::handle_FinishOperation, this,
       boost::asio::placeholders::error));
@@ -97 +120 @@
 
   // place id into nextids
-  nextids.push_back(nextid);
-  nextid = JobId::IllegalJob;
+  nextids.insert(nextids.end(), ids.begin(), ids.end());
+  ids.clear();
+  NumberIds = 0;
 
   // and finish operation

src/Fragmentation/Automation/Operations/Controllers/GetNextJobIdOperation.hpp

@@ -30 +30 @@
   /// Constructor for class GetNextJobIdOperation.
   GetNextJobIdOperation(Connection &_connection) :
-    AsyncOperation(std::string("getnextjobid"), _connection),
-    nextid(JobId::IllegalJob)
+    AsyncOperation(std::string("getnextjobid"), _connection)
   {}
   /// Destructor for class GetNextJobIdOperation
@@ -41 +40 @@
       boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
 
-  /// Callback function when doneJobs have been received.
-  void handle_ReceiveNextId(const boost::system::error_code& e);
+  /// Callback function when sending number of desired job ids.
+  void handle_SendNumberIds(const boost::system::error_code& e);
+
+  /// Callback function when new job ids have been received.
+  void handle_ReceiveNextIds(const boost::system::error_code& e);
+
+  /// setter for the desired number of ids on next connect
+  void setDesiredIds(const size_t _number) {
+    NumberIds = _number;
+  }
 
   /// Getter for nextid
@@ -56 +63 @@
   void handle_FinishOperation(const boost::system::error_code& e);
 
-  /// current jobs left to calculate and currently calculated results
+private:
+  //!> number of desired job ids
+  size_t NumberIds;
+
+  //!> temporary for a bunch of received ids
+  std::vector<JobId_t> ids;
+
+  //!> number of received job ids
   std::list<JobId_t> nextids;
-
-  // temporary for receiving another job id
-  JobId_t nextid;
 };
 

src/Fragmentation/Automation/controller.cpp

@@ -233 +233 @@
         } else {
           // get an id for every filename
-          for (int argcount = 4; argcount < argc; ++argcount) {
-            controller.requestId(argv[1], argv[2]);
-          }
+          controller.requestIds(argv[1], argv[2], argc-4);
         }
         break;
@@ -245 +243 @@
           ELOG(1, "'createjobs' requires two options: [command] [argument].");
         } else {
-          controller.requestId(argv[1], argv[2]);
+          controller.requestIds(argv[1], argv[2], 1);
         }
         break;