Changeset b0b64c for src/Fragmentation

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:

c7deca

Parents:

12d15a

git-author:

Frederik Heber <heber@…> (11/24/11 19:12:49)

git-committer:

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

Message:

FragmentScheduler now contains a FragmentQueue and serves single jobs therefrom.

• e.g. currently we only push one job, hence only a single worker is served. Others afterwards don't receive a job.
• we lack a mechanism to give feedback to the client, i.e. a pseudo job such that he knows that the queue is empty right now. Later this should then indicate a wait (for a specific amount of time).

Location:

src/Fragmentation/Automation

Files:

• FragmentQueue.hpp (modified) (1 diff)
• FragmentScheduler.cpp (modified) (4 diffs)
• FragmentScheduler.hpp (modified) (2 diffs)
• FragmentWorker.cpp (modified) (4 diffs)
• FragmentWorker.hpp (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• unittests/FragmentQueueUnitTest.cpp (modified) (3 diffs)

src/Fragmentation/Automation/FragmentQueue.hpp

@@ -24 +24 @@
 
 /** This class contains a deque for temporarily storing the FragmentJob
- * instances until they are receive by the server. Also all results are
+ * instances until they are received by the server. Also all results are
  * contained herein.
  */

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -33 +33 @@
 #include <boost/serialization/vector.hpp>
 #include "CodePatterns/Info.hpp"
+#include "CodePatterns/Log.hpp"
 #include "FragmentJob.hpp"
 
@@ -42 +43 @@
   )
 {
-    Info info(__FUNCTION__);
+  Info info(__FUNCTION__);
   FragmentJob s(std::string("test"), 1);
-  jobs_.push_back(s);
+  JobsQueue.pushJob(s);
 
   // Start an accept operation for a new connection.
@@ -60 +61 @@
   if (!e)
   {
-    // Successfully accepted a new connection. Send the list of jobs to the
-    // client. The connection::async_write() function will automatically
-    // serialize the data structure for us.
-    conn->async_write(jobs_,
-      boost::bind(&FragmentScheduler::handle_write, this,
-      boost::asio::placeholders::error, conn));
+    // Successfully accepted a new connection.
+    // Check whether there are jobs in the queue
+    if (JobsQueue.isJobPresent()) {
+      // pop a job and send it to the client.
+      FragmentJob s(JobsQueue.popJob());
+      // The connection::async_write() function will automatically
+      // serialize the data structure for us.
+      conn->async_write(s,
+        boost::bind(&FragmentScheduler::handle_write, this,
+        boost::asio::placeholders::error, conn));
+    } else {
+      ELOG(2, "There is currently no job present in the queue.");
+    }
 
     // Start an accept operation for a new Connection.
@@ -78 +86 @@
     // accept operation the io_service will run out of work to do and the
     // server will exit.
-    std::cerr << "Error: " << e.message() << std::endl;
+    ELOG(0, e.message());
   }
 }

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -19 +19 @@
 #include "Connection.hpp"
 #include "FragmentJob.hpp"
+#include "FragmentQueue.hpp"
 
 /** FragmentScheduler serves FragmentJobs to Workers.
@@ -40 +41 @@
   boost::asio::ip::tcp::acceptor acceptor_;
 
-  /// The data to be sent to each client.
-  std::vector<FragmentJob> jobs_;
+  /// Queue with data to be sent to each client.
+  FragmentQueue JobsQueue;
 };
 

src/Fragmentation/Automation/FragmentWorker.cpp

@@ -32 +32 @@
 #include <boost/serialization/vector.hpp>
 #include "CodePatterns/Info.hpp"
+#include "CodePatterns/Log.hpp"
 #include "FragmentJob.hpp"
 #include "FragmentWorker.hpp"
@@ -67 +68 @@
     // of jobs. The connection::async_read() function will automatically
     // decode the data that is read from the underlying socket.
-    connection_.async_read(jobs_,
+    connection_.async_read(job,
       boost::bind(&FragmentWorker::handle_read, this,
       boost::asio::placeholders::error));
@@ -81 +82 @@
     // operation the io_service will run out of work to do and the client will
     // exit.
-    std::cerr << "Error: " << e.message() << std::endl;
+    ELOG(1, e.message());
   }
 }
@@ -92 +93 @@
   {
     // Print out the data that was received.
-    for (std::size_t i = 0; i < jobs_.size(); ++i)
-    {
-        std::cout << "Job number " << i << "\n";
-        std::cout << "  output: " << jobs_[i].outputfile << "\n";
-        std::cout << "  id: " << jobs_[i].getId() << "\n";
-    }
+    std::cout << "Job output: " << job.outputfile << "\n";
+    std::cout << "Job id: " << job.getId() << "\n";
   }
   else
   {
     // An error occurred.
-    std::cerr << e.message() << std::endl;
+    ELOG(1, e.message());
   }
 

src/Fragmentation/Automation/FragmentWorker.hpp

@@ -41 +41 @@
 
   /// The data received from the server.
-  std::vector<FragmentJob> jobs_;
+  FragmentJob job;
 };
 

src/Fragmentation/Automation/Makefile.am

@@ -18 +18 @@
   atexit.cpp \
   FragmentJob.cpp \
+  FragmentQueue.cpp \
+  FragmentResult.cpp \
   FragmentScheduler.cpp \
   JobId.cpp \
@@ -26 +28 @@
   Connection.hpp \
   FragmentJob.hpp \
+  FragmentQueue.hpp \
+  FragmentResult.hpp \
   FragmentScheduler.hpp \
   JobId.hpp

src/Fragmentation/Automation/unittests/FragmentQueueUnitTest.cpp

@@ -135 +135 @@
   FragmentResult wrongIdResult(2);
 
-  // check presence
+  // check that none are present and we can't get result yet
   CPPUNIT_ASSERT( !queue->isResultPresent(1) );
   CPPUNIT_ASSERT( !queue->isResultPresent(2) );
@@ -143 +143 @@
 #endif
 
-  /// check for wrong id
+  /// check for admonishing wrong id
 #ifndef NDEBUG
   std::cout << "The following assertion is intended and does not indicate a failure." << std::endl;
   CPPUNIT_ASSERT_THROW( queue->pushResult(wrongIdResult), Assert::AssertionFailure );
 #endif
+
+  // push correct result
 #ifndef NDEBUG
   CPPUNIT_ASSERT_NO_THROW( queue->pushResult(testResult) );
@@ -157 +159 @@
   CPPUNIT_ASSERT( queue->isResultPresent(1) );
 
+  // obtain result again
 #ifndef NDEBUG
   CPPUNIT_ASSERT_NO_THROW( queue->getResult(1) );