Changeset 0bdd51b for src

Timestamp:

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

630a6e

Parents:

a1b77d

git-author:

Frederik Heber <heber@…> (11/24/11 20:34:51)

git-committer:

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

Message:

Added regression test for Server/Client construct.

• currently we expect the Server to shut down after the queue is discovered empty.
• added Exitflag and associated enum to FragmentWorker.
• FragmentScheduler exits gracefully when there are no more jobs in the queue.

Location:

src/Fragmentation/Automation

Files:

• FragmentScheduler.cpp (modified) (2 diffs)
• FragmentWorker.cpp (modified) (5 diffs)
• FragmentWorker.hpp (modified) (2 diffs)
• Worker.cpp (modified) (3 diffs)

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -73 +73 @@
         boost::bind(&FragmentScheduler::handle_write, this,
         boost::asio::placeholders::error, conn));
+
+      // Start an accept operation for a new Connection only when there
+      // are still jobs present otherwise we quit.
+      connection_ptr new_conn(new Connection(acceptor_.get_io_service()));
+      acceptor_.async_accept(new_conn->socket(),
+        boost::bind(&FragmentScheduler::handle_accept, this,
+        boost::asio::placeholders::error, new_conn));
     } else {
       // send the static NoJob
@@ -81 +88 @@
       ELOG(2, "There is currently no job present in the queue.");
     }
-
-    // Start an accept operation for a new Connection.
-    connection_ptr new_conn(new Connection(acceptor_.get_io_service()));
-    acceptor_.async_accept(new_conn->socket(),
-      boost::bind(&FragmentScheduler::handle_accept, this,
-      boost::asio::placeholders::error, new_conn));
   }
   else

src/Fragmentation/Automation/FragmentWorker.cpp

@@ -42 +42 @@
     const std::string& service) :
   connection_(io_service),
-  result(JobId::IllegalJob)
+  result(JobId::IllegalJob),
+  Exitflag(OkFlag)
 {
     Info info(__FUNCTION__);
@@ -83 +84 @@
     // operation the io_service will run out of work to do and the client will
     // exit.
+    Exitflag = ErrorFlag;
     ELOG(1, e.message());
   }
@@ -101 +103 @@
     } else {
       std::cout << "The server has no job for me." << std::endl;
+      Exitflag = NoJobFlag;
     }
   }
@@ -106 +109 @@
   {
     // An error occurred.
+    Exitflag = ErrorFlag;
     ELOG(1, e.message());
   }
@@ -112 +116 @@
   // work to do and the client will exit.
 }
+

src/Fragmentation/Automation/FragmentWorker.hpp

@@ -37 +37 @@
   void handle_read(const boost::system::error_code& e);
 
+  enum Exitflag_t {
+    OkFlag = 0,
+    NoJobFlag = 1,
+    ErrorFlag = 255
+  };
+
+  /** Returns the flag of the handled operation.
+   *
+   */
+  size_t getExitflag() const
+  {
+    return Exitflag;
+  }
+
 private:
   /// The Connection to the server.
@@ -46 +60 @@
   /// The result created to be sent to the server.
   FragmentResult result;
+
+  /// exit flag to give at program exit
+  enum Exitflag_t Exitflag;
 };
 

src/Fragmentation/Automation/Worker.cpp

@@ -40 +40 @@
   atexit(cleanUp);
 
+  size_t Exitflag = 0;
   try
   {
@@ -55 +56 @@
       io_service.run();
     }
+    Exitflag = client.getExitflag();
   }
   catch (std::exception& e)
@@ -62 +64 @@
 
 
-  return 0;
+  return Exitflag;
 }