Changeset c7deca for src/Fragmentation/Automation

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:

7b22e9

Parents:

b0b64c

git-author:

Frederik Heber <heber@…> (11/24/11 19:21:52)

git-committer:

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

Message:

Added static NoJob (id0) to FragmentScheduler to indicate empty queue to client.

• added enum to class JobId with special ids.

Location:

src/Fragmentation/Automation

Files:

• FragmentScheduler.cpp (modified) (2 diffs)
• FragmentScheduler.hpp (modified) (1 diff)
• FragmentWorker.cpp (modified) (1 diff)
• JobId.hpp (modified) (1 diff)
• unittests/FragmentResultUnitTest.cpp (modified) (2 diffs)

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -38 +38 @@
 #include "FragmentScheduler.hpp"
 
+FragmentJob FragmentScheduler::NoJob(std::string("NoJob"), JobId::NoJob);
+
 FragmentScheduler::FragmentScheduler(boost::asio::io_service& io_service, unsigned short port) :
   acceptor_(io_service,
@@ -72 +74 @@
         boost::asio::placeholders::error, conn));
     } else {
+      // send the static NoJob
+      conn->async_write(NoJob,
+        boost::bind(&FragmentScheduler::handle_write, this,
+        boost::asio::placeholders::error, conn));
+
       ELOG(2, "There is currently no job present in the queue.");
     }

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -43 +43 @@
   /// Queue with data to be sent to each client.
   FragmentQueue JobsQueue;
+
+  // static entity to indicate to clients that the queue is empty.
+  static FragmentJob NoJob;
 };
 

src/Fragmentation/Automation/FragmentWorker.cpp

@@ -92 +92 @@
   if (!e)
   {
-    // Print out the data that was received.
-    std::cout << "Job output: " << job.outputfile << "\n";
-    std::cout << "Job id: " << job.getId() << "\n";
+    if (job.getId() != JobId::NoJob) {
+      // Print out the data that was received.
+      std::cout << "Job output: " << job.outputfile << "\n";
+      std::cout << "Job id: " << job.getId() << "\n";
+    } else {
+      std::cout << "The server has no job for me." << std::endl;
+    }
   }
   else

src/Fragmentation/Automation/JobId.hpp

@@ -28 +28 @@
   ~JobId();
 
+  enum {
+    NoJob = 0,
+    IllegalJob = -1
+  };
+
   const JobId_t getId() const;
 

src/Fragmentation/Automation/unittests/FragmentResultUnitTest.cpp

@@ -29 +29 @@
 
 #include "FragmentResult.hpp"
+#include "JobId.hpp"
 
 #include "CodePatterns/Assert.hpp"
@@ -85 +86 @@
   boost::archive::text_iarchive ia(stream);
   // read class state from archive
-  FragmentResult otherResult(-1);
+  FragmentResult otherResult(JobId::IllegalJob);
 
   ia >> otherResult;