Changeset 41c1b7 for src/Fragmentation/Automation/Pool/WorkerPool.cpp

Timestamp:

Jun 27, 2012, 4:07:21 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:

38032a

Parents:

5d8c0f

git-author:

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

git-committer:

Frederik Heber <heber@…> (06/27/12 16:07:21)

Message:

HUGE: Added PoolWorker, removed (Fragment)Worker, and rewrote parts of FragmentScheduler.

• PoolWorker uses EnrollInPoolOperation and SubmitResultOperation to enroll, get the job and submit the result. Enrolling and getting the job is combined to have the same workflow for the moment until the pool is fully implemented.
• WorkerListener_t in FragmentScheduler has a callback instance to access sendJobToWorker function for sending jobs when a Worker has connected.
• FragmentWorker and Worker have been removed, also WokOnJobOperation. They are all replaced by PoolWorker and its own Operations.

ToDo:

• FragmentQueue needs a callback function when new jobs have been added.
• WorkerPool needs a callback function when a worker is idle.
• WorkerListener_t then does not need a callback anymore, just access to the pool who has then the callback.
• so far PoolWorker quits after first job (and is also removed by Server).

File:

• src/Fragmentation/Automation/Pool/WorkerPool.cpp (modified) (5 diffs)

src/Fragmentation/Automation/Pool/WorkerPool.cpp

@@ -76 +76 @@
   // return address
   return returnaddress;
+}
+
+WorkerPool::Idle_Queue_t::iterator WorkerPool::getIdleWorker(const WorkerAddress &address)
+{
+  Idle_Queue_t::iterator idleiter = idle_queue.begin();
+  while (idleiter != idle_queue.end()) {
+    if (idleiter->second == address) {
+      break;
+    }
+    ++idleiter;
+  }
+  return idleiter;
 }
 
@@ -130 +142 @@
   Pool_t::iterator iter = pool.find( address );
   if (iter != pool.end()) {
-    Idle_Queue_t::iterator idleiter = idle_queue.begin();
-    while (idleiter != idle_queue.end()) {
-      if (idleiter->second == address) {
-        idle_queue.erase(idleiter);
-        break;
-      }
-    }
+    Idle_Queue_t::iterator idleiter = getIdleWorker(address);
+    if (idleiter != idle_queue.end())
+      idle_queue.erase(idleiter);
     Busy_Queue_t::iterator busyiter = busy_queue.find(address);
     if (busyiter != busy_queue.end())
@@ -147 +155 @@
         +" is in pool and both idle and busy!");
     pool.erase(iter);
+    LOG(1, "INFO: Removed worker " << address << " from pool.");
     return true;
   } else {
@@ -174 +183 @@
 void WorkerPool::markWorkerBusy(Idle_Queue_t::iterator &iter)
 {
-  if (isWorkerBusy(iter->second))
+  const WorkerAddress returnaddress = iter->second;
+  if (isWorkerBusy(returnaddress))
     return;
-  const WorkerAddress returnaddress = iter->second;
   const priority_t priority = iter->first;
 
@@ -206 +215 @@
     busy_queue.erase(address);
     idle_queue.insert( make_pair( priority, address) );
-  }
-}
+
+    LOG(1, "INFO: Worker " << address << " is now marked idle.");
+  }
+}