Changeset 3c4a5e for src

Timestamp:

May 4, 2012, 2:19:07 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:

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.

Location:

src/Fragmentation/Automation

Files:

• FragmentController.cpp (modified) (4 diffs)
• FragmentController.hpp (modified) (4 diffs)
• FragmentScheduler.cpp (modified) (5 diffs)
• FragmentScheduler.hpp (modified) (3 diffs)
• Makefile.am (modified) (2 diffs)
• ResultChecker.cpp (added)

src/Fragmentation/Automation/FragmentController.cpp

@@ -93 +93 @@
 }
 
+/** Handle completion of a connect operation.
+ *
+ * \param e error code if something went wrong
+ * \param endpoint_iterator endpoint of the connection
+ */
+void FragmentController::handle_connect_check(const boost::system::error_code& e,
+    boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
+{
+  Info info(__FUNCTION__);
+  if (!e)
+  {
+    // Successfully established connection. Start operation to read the vector
+    // of jobs. The connection::async_write() function will automatically
+    // encode the data that is written to the underlying socket.
+    LOG(1, "INFO: Checking number of done jobs ...");
+    connection_.async_read(doneJobs,
+      boost::bind(&FragmentController::handle_ReceiveDoneJobs, this,
+      boost::asio::placeholders::error));
+  } else if (endpoint_iterator != boost::asio::ip::tcp::resolver::iterator()) {
+    // Try the next endpoint.
+    connection_.socket().close();
+    boost::asio::ip::tcp::endpoint endpoint = *endpoint_iterator;
+    connection_.socket().async_connect(endpoint,
+      boost::bind(&FragmentController::handle_connect_check, this,
+      boost::asio::placeholders::error, ++endpoint_iterator));
+  } else {
+    // An error occurred. Log it and return. Since we are not starting a new
+    // operation the io_service will run out of work to do and the client will
+    // exit.
+    Exitflag = ErrorFlag;
+    ELOG(1, e.message());
+  }
+}
+
 /** Callback function when jobs have been sent.
  *
@@ -100 +134 @@
 {
   Info info(__FUNCTION__);
-  // do nothing
-  LOG(1, "INFO: Jobs sent.");
+  if (!e)
+  {
+    LOG(1, "INFO: Sent jobs ...");
+  }
+  else
+  {
+    // An error occurred.
+    Exitflag = ErrorFlag;
+    ELOG(1, e.message());
+  }
+
+  // Since we are not starting a new operation the io_service will run out of
+  // work to do and the client will exit.
+}
+
+/** Callback function when doneJobs have been received.
+ *
+ * \param e error code if something went wrong
+ */
+void FragmentController::handle_ReceiveDoneJobs(const boost::system::error_code& e)
+{
+  Info info(__FUNCTION__);
+  // Nothing to do.
+  LOG(1, "INFO: "+toString(doneJobs)+" jobs are currently done.");
 }
 
@@ -137 +193 @@
 }
 
+/** Internal function to connect to the endpoint of the server asynchronuously.
+ *
+ * We require internal connetion_ and host and service to be set up for this.
+ */
+void FragmentController::connect_check()
+{
+  Info info(__FUNCTION__);
+  // Resolve the host name into an IP address.
+  boost::asio::ip::tcp::resolver::iterator endpoint_iterator = getEndpointIterator();
+  boost::asio::ip::tcp::endpoint endpoint = *endpoint_iterator;
+
+  // Start an asynchronous connect operation.
+  std::cout << "Connecting to endpoint " << endpoint << " to check " << std::endl;
+  connection_.socket().async_connect(endpoint,
+    boost::bind(&FragmentController::handle_connect_check, this,
+      boost::asio::placeholders::error, ++endpoint_iterator));
+}
+
 /** Internal function to disconnect connection_ correctly.
  *
@@ -165 +239 @@
 }
 
+/** Prepares the calculation of the results for the current jobs.
+ */
+void FragmentController::checkResults()
+{
+  Info info(__FUNCTION__);
+  // connect
+  connect_check();
+  //disconnect
+  disconnect();
+}
+
+/** Getter for doneJobs.
+ *
+ * \sa checkResults()
+ * \param doneJobs
+ */
+size_t FragmentController::getDoneJobs() const
+{
+  return doneJobs;
+}

src/Fragmentation/Automation/FragmentController.hpp

@@ -41 +41 @@
       boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
 
+  /// Handle completion of a accept operation.
+  void handle_connect_check(const boost::system::error_code& e,
+      boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
+
   /// Callback function when bunch of jobs have been sent.
   void handle_SendJobs(const boost::system::error_code& e);
+
+  /// Callback function when doneJobs have been received.
+  void handle_ReceiveDoneJobs(const boost::system::error_code& e);
 
   /// place number of jobs into this controller
@@ -61 +68 @@
   }
 
+  /// get the number of finished results for the current jobs
+  void checkResults();
+
+  /// Getter for doneJobs
+  size_t getDoneJobs() const;
+
 private:
   /// internal function to resolve host name and ip address
@@ -67 +80 @@
   /// internal function to connect to server and send jobs for calculating jobs
   void connect_calc();
+
+  /// internal function to connect to server and send jobs for checking donejobs
+  void connect_check();
 
   /// internal function to disconnect from server
@@ -86 +102 @@
   /// flag to give on program exit
   enum Exitflag_t Exitflag;
+
+  /// currently calculated results
+  size_t doneJobs;
 };
 

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.");
+}

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -34 +34 @@
   enum Exitflag_t{
     OkFlag = 0,
-    ErrorFlag = 255
+    ControllerErrorFlag = 254,
+    WorkerErrorFlag = 255
   };
 
@@ -63 +64 @@
 
 private:
+
+  /// Controller callback function when checking on state of results.
+  void handle_CheckResultState(const boost::system::error_code& e, connection_ptr conn);
+
   /// The acceptor object used to accept incoming worker socket connections.
   boost::asio::ip::tcp::acceptor worker_acceptor_;
@@ -75 +80 @@
   std::vector<FragmentJob> jobs;
 
+  /// number of jobs that are calculated, required for returning status
+  size_t doneJobs;
+
   /// Queue with data to be sent to each client.
   FragmentQueue JobsQueue;

src/Fragmentation/Automation/Makefile.am

@@ -45 +45 @@
 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
 
-bin_PROGRAMS += JobAdder Server Worker
+bin_PROGRAMS += JobAdder ResultChecker Server Worker
 
 CONTROLLERSOURCE = \
@@ -81 +81 @@
   ${CodePatterns_LIBS}
 
+ResultChecker_SOURCES = $(CONTROLLERSOURCE) $(CONTROLLERHEADER) ResultChecker.cpp
+ResultChecker_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
+ResultChecker_CXXFLAGS = $(AM_CPPFLAGS)
+ResultChecker_LDADD = \
+  libMolecuilderFragmentJobs.la \
+  libMolecuilderFragmentationAutomation.la \
+  $(BOOST_ASIO_LIBS) \
+  $(BOOST_SERIALIZATION_LIBS) \
+  $(BOOST_THREAD_LIBS) \
+  $(BOOST_SYSTEM_LIBS) \
+  ${CodePatterns_LIBS}
+
 Server_SOURCES = $(SERVERSOURCE) $(SERVERHEADER) Server.cpp
 Server_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)