Changeset 0196c6 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:

dba6d1

Parents:

e70b9d

git-author:

Frederik Heber <heber@…> (12/09/11 20:11:50)

git-committer:

Frederik Heber <heber@…> (05/04/12 14:19:07)

Message:

Added Shutdown as choice to ControllerChoices.

• new helper app Shutdowner that shuts down Server.
• TESTFIX: Changed regression test Fragmentation/Automation where now Shutdowner is uses instead of Jobadder with 0 jobs to power down controller socket.

Location:

src/Fragmentation/Automation

Files:

• ControllerChoices.hpp (modified) (1 diff)
• FragmentController.cpp (modified) (3 diffs)
• FragmentController.hpp (modified) (3 diffs)
• FragmentScheduler.cpp (modified) (5 diffs)
• Makefile.am (modified) (2 diffs)
• Shutdowner.cpp (added)

src/Fragmentation/Automation/ControllerChoices.hpp

@@ -20 +20 @@
   ReceiveJobs,
   CheckState,
-  SendResults
+  SendResults,
+  Shutdown
 };
 

src/Fragmentation/Automation/FragmentController.cpp

@@ -157 +157 @@
 }
 
+/** 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_shutdown(const boost::system::error_code& e,
+    boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
+{
+  Info info(__FUNCTION__);
+  if (!e)
+  {
+    // Successfully established connection. Give choice.
+    enum ControllerChoices choice = Shutdown;
+    connection_.async_write(choice,
+      boost::bind(&FragmentController::handle_FinishOperation, 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_calc, 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 operation has been completed.
  *
@@ -339 +371 @@
 }
 
+/** 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_shutdown()
+{
+  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 get results " << std::endl;
+  connection_.socket().async_connect(endpoint,
+    boost::bind(&FragmentController::handle_connect_shutdown, this,
+      boost::asio::placeholders::error, ++endpoint_iterator));
+}
+
 /** Internal function to disconnect connection_ correctly.
  *
@@ -403 +453 @@
 }
 
+/** Function to initiate shutdown of server.
+ *
+ */
+void FragmentController::shutdown()
+{
+  // connect
+  connect_shutdown();
+  //disconnect
+  disconnect();
+}
+
 /** Getter for doneJobs.
  *

src/Fragmentation/Automation/FragmentController.hpp

@@ -49 +49 @@
       boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
 
+  /// Handle completion of a Shutdown operation.
+  void handle_connect_shutdown(const boost::system::error_code& e,
+      boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
+
   /// Handle completion of an operation.
   void handle_FinishOperation(const boost::system::error_code& e);
@@ -84 +88 @@
   void obtainResults();
 
+  /// prepares the server's shutdown
+  void shutdown();
+
   /// get the results for the current jobs
   std::vector<FragmentResult> getResults();
@@ -105 +112 @@
   /// internal function to connect to server and receive calculated results
   void connect_get();
+
+  /// internal function to connect to server and receive calculated results
+  void connect_shutdown();
 
   /// internal function to disconnect from server

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -228 +228 @@
   if (!e)
   {
+    bool LaunchNewAcceptor = true;
     // switch over the desired choice read previously
     switch(choice) {
@@ -254 +255 @@
         boost::bind(&FragmentScheduler::handle_CheckResultState, this,
         boost::asio::placeholders::error, conn));
-
-      initiateControllerSocket();
       break;
     }
@@ -266 +265 @@
         boost::bind(&FragmentScheduler::handle_SendResults, this,
         boost::asio::placeholders::error, conn));
-
-      initiateControllerSocket();
+      break;
+    }
+    case Shutdown:
+    {
+      LaunchNewAcceptor = false;
       break;
     }
@@ -278 +280 @@
     choice = NoOperation;
 
+    if (LaunchNewAcceptor) {
+      LOG(1, "Launching new acceptor on socket.");
+      // Start an accept operation for a new Connection.
+      connection_ptr new_conn(new Connection(controller_acceptor_.get_io_service()));
+      controller_acceptor_.async_accept(new_conn->socket(),
+        boost::bind(&FragmentScheduler::handle_AcceptController, this,
+        boost::asio::placeholders::error, new_conn));
+    }
   }
   else
@@ -310 +320 @@
     if (initiateSocket)
       initiateWorkerSocket();
-    // launch new acceptor of queue has been filled/is full
-    initiateControllerSocket();
-  } else {
-    LOG(1, "INFO: Shutting down controller socket.");
   }
 

src/Fragmentation/Automation/Makefile.am

@@ -45 +45 @@
 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
 
-bin_PROGRAMS += JobAdder ResultChecker ResultGetter Server Worker
+bin_PROGRAMS += JobAdder ResultChecker ResultGetter Server Shutdowner Worker
 
 CONTROLLERSOURCE = \
@@ -119 +119 @@
   ${CodePatterns_LIBS}
 
+Shutdowner_SOURCES = $(CONTROLLERSOURCE) $(CONTROLLERHEADER) Shutdowner.cpp
+Shutdowner_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
+Shutdowner_CXXFLAGS = $(AM_CPPFLAGS)
+Shutdowner_LDADD = \
+  libMolecuilderFragmentJobs.la \
+  libMolecuilderFragmentationAutomation.la \
+  $(BOOST_ASIO_LIBS) \
+  $(BOOST_SERIALIZATION_LIBS) \
+  $(BOOST_THREAD_LIBS) \
+  $(BOOST_SYSTEM_LIBS) \
+  ${CodePatterns_LIBS}
+
 Worker_SOURCES = $(WORKERSOURCE) $(WORKERHEADER)
 Worker_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)