Changeset 9a6b895

Timestamp:

Jul 2, 2012, 8:31:56 AM (12 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:

a40c85

Parents:

f45c08

git-author:

Frederik Heber <heber@…> (04/24/12 14:56:21)

git-committer:

Frederik Heber <heber@…> (07/02/12 08:31:56)

Message:

FIX: FragmentScheduler now has an OperationQueue that monitors its async.ops.

• this fixes the issues with multiple jobs being handed out.

Location:

src/Fragmentation/Automation

Files:

• FragmentScheduler.cpp (modified) (5 diffs)
• FragmentScheduler.hpp (modified) (3 diffs)

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -28 +28 @@
 #include <algorithm>
 #include <boost/bind.hpp>
+#include <boost/lambda/lambda.hpp>
 #include <boost/lexical_cast.hpp>
 #include <iostream>
@@ -37 +38 @@
 #include "CodePatterns/Observer/Notification.hpp"
 #include "ControllerChoices.hpp"
+#include "Operations/Servers/SendJobToWorkerOperation.hpp"
 #include "Operations/Workers/EnrollInPoolOperation.hpp"
 #include "Jobs/MPQCCommandJob.hpp"
@@ -68 +70 @@
         boost::bind(&FragmentScheduler::shutdown, boost::ref(*this))),
     connection(_io_service),
-    sendJobOp(connection),
     shutdownWorkerOp(connection)
 {
@@ -509 +510 @@
       "FragmentScheduler::sendJobToWorker() - Worker "+toString(address)+" is not marked as busy.");
   LOG(1, "INFO: Sending job " << job->getId() << " to worker " << address << ".");
-  sendJobOp.setJob(job);
-  sendJobOp(address.host, address.service);
+
+  // create op, sign on, and hand over to queue
+  AsyncOperation *sendJobOp = new SendJobToWorkerOperation(connection,job);
+  OpQueue.push_back(sendJobOp, address);
 }
 
@@ -584 +587 @@
 void FragmentScheduler::update(Observable *publisher)
 {
-  ASSERT(0, "FragmentScheduler::update() - we are not signed on for global updates.");
+  AsyncOperation *op = static_cast<AsyncOperation *>(publisher);
+  if (op != NULL) {
+    LOG(1, "INFO: We are note notified that " << op->getName() << " is done, removing ...");
+
+    // remove from queue
+    OpQueue.remove(op, this);
+  }
 }
 

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -14 +14 @@
 #endif
 
-#include <vector>
 #include <boost/asio.hpp>
 #include <boost/function.hpp>
+#include <boost/shared_ptr.hpp>
+#include <deque>
+#include <vector>
 
 #include "CodePatterns/Observer/Observer.hpp"
 #include "Connection.hpp"
 #include "ControllerChoices.hpp"
-#include "Operations/Servers/SendJobToWorkerOperation.hpp"
+#include "Operations/AsyncOperation.hpp"
+#include "Operations/OperationQueue.hpp"
 #include "Operations/Servers/ShutdownWorkerOperation.hpp"
 #include "ControllerChoices.hpp"
@@ -52 +55 @@
   void shutdownWorker(const WorkerAddress &address);
   void removeAllWorkers();
+  void cleanupOperationQueue(AsyncOperation *op);
 
   void update(Observable *publisher);
   void recieveNotification(Observable *publisher, Notification_ptr notification);
   void subjectKilled(Observable *publisher);
+
 
   class WorkerListener_t : public Listener
@@ -214 +219 @@
   Connection connection;
 
-  //!> internal operation to send jobs to workers
-  mutable SendJobToWorkerOperation sendJobOp;
+  //!> internal queue for all asynchronous operations
+  OperationQueue OpQueue;
 
   //!> internal operation to shutdown a worker