Changeset 92b1d3 for src/Fragmentation

Timestamp:

Jul 2, 2012, 8:32:02 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:

dc759c

Parents:

81c96b6

git-author:

Frederik Heber <heber@…> (04/24/12 16:53:31)

git-committer:

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

Message:

OperationQueue now has a max_connections and allows only this number of running operations.

• OperationQueue::launchNextOp() is called by update() and push_back().
• new AddressMap takes endpoint addresses and is used to know which operations still have to be executed.

Location:

src/Fragmentation/Automation/Operations

Files:

• OperationQueue.cpp (modified) (3 diffs)
• OperationQueue.hpp (modified) (3 diffs)

src/Fragmentation/Automation/Operations/OperationQueue.cpp

@@ -35 +35 @@
 #include "WorkerAddress.hpp"
 
+size_t OperationQueue::max_connections = 1;
+
 OperationQueue::OperationQueue_t::iterator OperationQueue::findOperation(AsyncOperation *op)
 {
@@ -48 +50 @@
     AsyncOp_ptr ptr(op); // this always prevents memory loss
     ptr->signOn(this);
-    queue.push_back( ptr );
+    OperationQueue_t::iterator iter = queue.insert(queue.end(), ptr );
     op = NULL;
-    // only start operation when address is valid
-    if ((!address.host.empty()) && (!address.service.empty()))
-      (*ptr)(address.host, address.service);
+    AddressMap.insert( make_pair(*iter, address) );
+    LaunchNextOp();
   } else {
     ELOG(1, "Given operation pointer is NULL.");
+  }
+}
+
+void OperationQueue::LaunchNextOp()
+{
+  // connection available?
+  if (getNumberOfRunningOps() < max_connections) {
+    // only start operation when address is valid
+    OperationQueue_t::iterator queueiter =
+        std::find_if(queue.begin(), queue.end(),
+            boost::bind(&AddressMap_t::count, boost::ref(AddressMap), boost::lambda::_1) );
+    if (queueiter != queue.end()) {
+      AddressMap_t::iterator mapiter = AddressMap.find(*queueiter);
+      ASSERT( mapiter != AddressMap.end(),
+          "OperationQueue::LaunchNextOp() - cannot find connection "+toString((*queueiter)->getName())+" in AddressMap.");
+      const WorkerAddress address = mapiter->second;
+      AsyncOp_ptr ptr = mapiter->first;
+      // always erase the op from the list of ones pending for launch
+      AddressMap.erase(mapiter);
+      // only launch when not a debug op
+      if ((!address.host.empty()) && (!address.service.empty())) {
+        LOG(2, "DEBUG: Launching next operation " << ptr->getName() << ".");
+       (*ptr)(address.host, address.service);
+      } else {
+        LOG(3, "DEBUG: Skipping debug operation " << ptr->getName() << " with empty address.");
+      }
+    } else {
+      LOG(2, "DEBUG: All remaining operations are already running.");
+    }
+  } else {
+    LOG(2, "DEBUG: Currently there are no free connections.");
   }
 }
@@ -82 +114 @@
     // remove from queue
     remove(op, this);
+    LaunchNextOp();
   }
 }

src/Fragmentation/Automation/Operations/OperationQueue.hpp

@@ -37 +37 @@
    */
   OperationQueue() :
-    Observer("OperationQueue")
+    Observer("OperationQueue"),
+    RunningOps(0)
   {}
   /** Default destructor for class OperationQueue.
@@ -74 +75 @@
   void remove(AsyncOperation *op, Observer *observer);
 
+  /** Returns the number of currently running operations.
+   *
+   * @return Gives the difference between the entries in the queue and in the AddressMap.
+   */
+  size_t getNumberOfRunningOps() const
+  {
+    return queue.size() - AddressMap.size();
+  }
+
+  /** Helper to launch the next pending operation.
+   *
+   */
+  void LaunchNextOp();
+
   //!> internal operation to send jobs to workers
   typedef std::deque<AsyncOp_ptr> OperationQueue_t;
@@ -84 +99 @@
   OperationQueue_t::iterator findOperation(AsyncOperation *op);
 
+  //!> internal number stating how many operations are running
+  size_t RunningOps;
+
+  //!> giving the maximum number of connections
+  static size_t max_connections;
+
 private:
   //!> internal queue with operations
   OperationQueue_t queue;
+
+  //!> typedef for the association for each operation to its address to connect to
+  typedef std::map<AsyncOp_ptr, WorkerAddress> AddressMap_t;
+  //!> Association for each operation to its address to connect to
+  AddressMap_t AddressMap;
 };