Changeset fb255d for src/Fragmentation/Automation/Pool

Timestamp:

Jul 2, 2012, 7:54:10 AM (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:

2344a3

Parents:

d6b12c

git-author:

Frederik Heber <heber@…> (02/29/12 17:39:33)

git-committer:

Frederik Heber <heber@…> (07/02/12 07:54:10)

Message:

WorkerPool is now observable.

• this is preparatory for allowing FragmentScheduler to contact idle Workers and sending them possibly present jobs.
• added NotificationObserver in unit test.

Location:

src/Fragmentation/Automation/Pool

Files:

• WorkerPool.cpp (modified) (7 diffs)
• WorkerPool.hpp (modified) (3 diffs)

src/Fragmentation/Automation/Pool/WorkerPool.cpp

@@ -28 +28 @@
 #include "CodePatterns/Info.hpp"
 #include "CodePatterns/Log.hpp"
+#include "CodePatterns/Observer/Channels.hpp"
 #include "Connection.hpp"
 
@@ -36 +37 @@
  *
  */
-WorkerPool::WorkerPool()
-{}
+WorkerPool::WorkerPool() :
+    Observable("WorkerPool")
+{
+  // observable stuff
+  Channels *OurChannel = new Channels;
+  NotificationChannels.insert( std::make_pair(this, OurChannel) );
+  // add instance for each notification type
+  for (size_t type = 0; type < NotificationType_MAX; ++type)
+    OurChannel->addChannel(type);
+}
 
 /** Destructor for class WorkerPool.
@@ -121 +130 @@
 bool WorkerPool::addWorker(const WorkerAddress& address)
 {
+  OBSERVE;
+  NOTIFY(WorkerAdded);
   std::pair<Pool_t::iterator, bool> inserter =
       pool.insert( address );
@@ -126 +137 @@
     LOG(1, "INFO: Successfully added "+toString(address)+" to pool.");
     idle_queue.insert( make_pair( default_priority, address ) );
+    NOTIFY(WorkerIdle);
     return true;
   } else {
@@ -142 +154 @@
   Pool_t::iterator iter = pool.find( address );
   if (iter != pool.end()) {
+    OBSERVE;
+    NOTIFY(WorkerRemoved);
     Idle_Queue_t::iterator idleiter = getIdleWorker(address);
     if (idleiter != idle_queue.end())
@@ -168 +182 @@
 void WorkerPool::removeAllWorkers()
 {
+  OBSERVE;
+  NOTIFY(WorkerRemoved);
   // empty pool and queue
   idle_queue.clear();
@@ -211 +227 @@
 {
   if (isWorkerBusy(address)) {
+    OBSERVE;
+    NOTIFY(WorkerIdle);
     Busy_Queue_t::const_iterator iter = busy_queue.find(address);
     const priority_t priority = iter->second;

src/Fragmentation/Automation/Pool/WorkerPool.hpp

@@ -18 +18 @@
 #include <string>
 
+#include "CodePatterns/Observer/Observable.hpp"
+
 #include "WorkerAddress.hpp"
 
@@ -28 +30 @@
  *
  */
-class WorkerPool
+class WorkerPool : public Observable
 {
   //!> grant unit test access
@@ -35 +37 @@
   WorkerPool();
   ~WorkerPool();
+
+  enum NotificationType {
+    WorkerIdle,
+    WorkerAdded,
+    WorkerRemoved,
+    NotificationType_MAX  // denotes the maximum of available notification types
+  };
 
   bool addWorker(const WorkerAddress &address);