Ignore:
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.

Location:
src/Fragmentation/Automation
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • src/Fragmentation/Automation/FragmentQueue.cpp

    rd6b12c rfb255d  
    7070void FragmentQueue::pushJob(FragmentJob::ptr job)
    7171{
    72   ASSERT(job->getId() != JobId::IllegalJob,
    73       "FragmentQueue::pushJob() - job to push has IllegalJob id.");
    74   ASSERT(!results.count(job->getId()),
    75       "FragmentQueue::pushJob() - job id "+toString(job->getId())+" has already been used.");
    76   OBSERVE;
    77   NOTIFY(JobAdded);
    78   results.insert( std::make_pair(job->getId(), NoResult));
    79   jobs.push_back(job);
     72  if ((job->getId() != JobId::IllegalJob) && (!results.count(job->getId()))) {
     73    OBSERVE;
     74    NOTIFY(JobAdded);
     75    results.insert( std::make_pair(job->getId(), NoResult));
     76    jobs.push_back(job);
     77  } else {
     78    ELOG(1, "job to push has IllegalJob id or id "+toString(job->getId())+" has already been used.");
     79    ASSERT(false,
     80        "job to push has IllegalJob id or id "+toString(job->getId())+" has already been used.");
     81  }
    8082}
    8183

  • src/Fragmentation/Automation/Pool/WorkerPool.cpp

    rd6b12c rfb255d  
    2828#include "CodePatterns/Info.hpp"
    2929#include "CodePatterns/Log.hpp"
     30#include "CodePatterns/Observer/Channels.hpp"
    3031#include "Connection.hpp"
    3132
    … …  
    3637 *
    3738 */
    38 WorkerPool::WorkerPool()
    39 {}
     39WorkerPool::WorkerPool() :
     40    Observable("WorkerPool")
     41{
     42  // observable stuff
     43  Channels *OurChannel = new Channels;
     44  NotificationChannels.insert( std::make_pair(this, OurChannel) );
     45  // add instance for each notification type
     46  for (size_t type = 0; type < NotificationType_MAX; ++type)
     47    OurChannel->addChannel(type);
     48}
    4049
    4150/** Destructor for class WorkerPool.
    … …  
    121130bool WorkerPool::addWorker(const WorkerAddress& address)
    122131{
     132  OBSERVE;
     133  NOTIFY(WorkerAdded);
    123134  std::pair<Pool_t::iterator, bool> inserter =
    124135      pool.insert( address );
    … …  
    126137    LOG(1, "INFO: Successfully added "+toString(address)+" to pool.");
    127138    idle_queue.insert( make_pair( default_priority, address ) );
     139    NOTIFY(WorkerIdle);
    128140    return true;
    129141  } else {
    … …  
    142154  Pool_t::iterator iter = pool.find( address );
    143155  if (iter != pool.end()) {
     156    OBSERVE;
     157    NOTIFY(WorkerRemoved);
    144158    Idle_Queue_t::iterator idleiter = getIdleWorker(address);
    145159    if (idleiter != idle_queue.end())
    … …  
    168182void WorkerPool::removeAllWorkers()
    169183{
     184  OBSERVE;
     185  NOTIFY(WorkerRemoved);
    170186  // empty pool and queue
    171187  idle_queue.clear();
    … …  
    211227{
    212228  if (isWorkerBusy(address)) {
     229    OBSERVE;
     230    NOTIFY(WorkerIdle);
    213231    Busy_Queue_t::const_iterator iter = busy_queue.find(address);
    214232    const priority_t priority = iter->second;

  • src/Fragmentation/Automation/Pool/WorkerPool.hpp

    rd6b12c rfb255d  
    1818#include <string>
    1919
     20#include "CodePatterns/Observer/Observable.hpp"
     21
    2022#include "WorkerAddress.hpp"
    2123
    … …  
    2830 *
    2931 */
    30 class WorkerPool
     32class WorkerPool : public Observable
    3133{
    3234  //!> grant unit test access
    … …  
    3537  WorkerPool();
    3638  ~WorkerPool();
     39
     40  enum NotificationType {
     41    WorkerIdle,
     42    WorkerAdded,
     43    WorkerRemoved,
     44    NotificationType_MAX  // denotes the maximum of available notification types
     45  };
    3746
    3847  bool addWorker(const WorkerAddress &address);

  • src/Fragmentation/Automation/unittests/Makefile.am

    rd6b12c rfb255d  
    143143
    144144WorkerPoolUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    145 WorkerPoolUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
     145WorkerPoolUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS} -I$(top_srcdir)/src
    146146WorkerPoolUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    147147  unittests/WorkerPoolUnitTest.cpp \
    … …  
    150150  Pool/WorkerPool.hpp \
    151151  WorkerAddress.cpp \
    152   WorkerAddress.hpp
     152  WorkerAddress.hpp \
     153  $(top_srcdir)/src/unittests/stubs/ObserverStub.cpp \
     154  $(top_srcdir)/src/unittests/stubs/ObserverStub.hpp
    153155WorkerPoolUnitTest_LDADD = \
    154156  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \

  • src/Fragmentation/Automation/unittests/WorkerPoolUnitTest.cpp

    rd6b12c rfb255d  
    2727
    2828#include "CodePatterns/Assert.hpp"
     29#include "CodePatterns/Observer/Channels.hpp"
    2930#include "Pool/WorkerPool.hpp"
    3031#include "WorkerAddress.hpp"
    … …  
    3839
    3940#include "stubs/FragmentJobStub.hpp"
     41#include "unittests/stubs/ObserverStub.hpp"
    4042
    4143// Registers the fixture into the 'registry'
    … …  
    4951
    5052  pool = new WorkerPool();
     53  addobserver = new NotificationObserver(pool->getChannel(WorkerPool::WorkerAdded));
     54  removeobserver = new NotificationObserver(pool->getChannel(WorkerPool::WorkerRemoved));
     55  idleobserver = new NotificationObserver(pool->getChannel(WorkerPool::WorkerIdle));
     56
     57  // and sign on
     58  pool->signOn(addobserver, WorkerPool::WorkerAdded);
     59  pool->signOn(removeobserver, WorkerPool::WorkerRemoved);
     60  pool->signOn(idleobserver, WorkerPool::WorkerIdle);
    5161}
    5262
    5363void WorkerPoolTest::tearDown()
    5464{
     65  pool->signOff(addobserver, WorkerPool::WorkerAdded);
     66  pool->signOff(removeobserver, WorkerPool::WorkerRemoved);
     67  pool->signOff(idleobserver, WorkerPool::WorkerIdle);
     68
     69  delete removeobserver;
     70  delete addobserver;
     71  delete idleobserver;
    5572  delete pool;
    5673}
    … …  
    6885  CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->busy_queue.size() );
    6986  CPPUNIT_ASSERT_EQUAL( (size_t)1, pool->pool.size() );
     87  CPPUNIT_ASSERT( addobserver->wasNotified );
     88  CPPUNIT_ASSERT( !removeobserver->wasNotified );
     89  CPPUNIT_ASSERT( idleobserver->wasNotified );
     90  addobserver->wasNotified = false;
     91  idleobserver->wasNotified = false;
    7092
    7193  // remove non-present worker
    7294  std::cout << "The following error message is intended and does not indicate a failure." << std::endl;
    7395  CPPUNIT_ASSERT( !pool->removeWorker(otheraddress) );
     96  CPPUNIT_ASSERT( !addobserver->wasNotified );
     97  CPPUNIT_ASSERT( !removeobserver->wasNotified );
     98  CPPUNIT_ASSERT( !idleobserver->wasNotified );
    7499
    75100  // check for presence
    … …  
    82107  CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->busy_queue.size() );
    83108  CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->pool.size() );
     109  CPPUNIT_ASSERT( !addobserver->wasNotified );
     110  CPPUNIT_ASSERT( removeobserver->wasNotified );
     111  CPPUNIT_ASSERT( !idleobserver->wasNotified );
     112  removeobserver->wasNotified = false;
    84113}
    85114
    … …  
    96125  CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->busy_queue.size() );
    97126  CPPUNIT_ASSERT_EQUAL( (size_t)1, pool->pool.size() );
     127  CPPUNIT_ASSERT( addobserver->wasNotified );
     128  CPPUNIT_ASSERT( !removeobserver->wasNotified );
     129  CPPUNIT_ASSERT( idleobserver->wasNotified );
     130  addobserver->wasNotified = false;
     131  idleobserver->wasNotified = false;
    98132
    99133  // unmark and check
    … …  
    120154  CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->idle_queue.size() );
    121155  CPPUNIT_ASSERT_EQUAL( (size_t)1, pool->busy_queue.size() );
     156  CPPUNIT_ASSERT( !addobserver->wasNotified );
     157  CPPUNIT_ASSERT( !removeobserver->wasNotified );
     158  CPPUNIT_ASSERT( !idleobserver->wasNotified );
    122159
    123160  // unmark and check
    … …  
    126163  CPPUNIT_ASSERT_EQUAL( (size_t)1, pool->idle_queue.size() );
    127164  CPPUNIT_ASSERT_EQUAL( (size_t)0, pool->busy_queue.size() );
     165  CPPUNIT_ASSERT( !addobserver->wasNotified );
     166  CPPUNIT_ASSERT( !removeobserver->wasNotified );
     167  CPPUNIT_ASSERT( idleobserver->wasNotified );
    128168}

  • src/Fragmentation/Automation/unittests/WorkerPoolUnitTest.hpp

    rd6b12c rfb255d  
    1818
    1919class WorkerPool;
     20class NotificationObserver;
    2021
    2122/********************************************** Test classes **************************************/
    … …  
    3637private:
    3738      WorkerPool *pool;
     39      NotificationObserver *addobserver;
     40      NotificationObserver *removeobserver;
     41      NotificationObserver *idleobserver;
    3842};
    3943
Note: See TracChangeset for help on using the changeset viewer.