Author: astitcher Date: Thu Jul 30 14:06:55 2009 New Revision: 799274 URL: http://svn.apache.org/viewvc?rev=799274&view=rev Log: Change remaining broker Timer clients to use the single broker Timer
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.h qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h?rev=799274&r1=799273&r2=799274&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h (original) +++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h Thu Jul 30 14:06:55 2009 @@ -122,6 +122,7 @@ void declareStandardExchange(const std::string& name, const std::string& type); boost::shared_ptr<sys::Poller> poller; + sys::Timer timer; Options config; ProtocolFactoryMap protocolFactories; std::auto_ptr<MessageStore> store; @@ -132,7 +133,6 @@ ExchangeRegistry exchanges; LinkRegistry links; boost::shared_ptr<sys::ConnectionCodec::Factory> factory; - sys::Timer timer; DtxManager dtxManager; SessionManager sessionManager; management::ManagementAgent* managementAgent; Modified: qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp?rev=799274&r1=799273&r2=799274&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp (original) +++ qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp Thu Jul 30 14:06:55 2009 @@ -41,18 +41,18 @@ // factored: The persistence element and maintenance element // should be factored separately LinkRegistry::LinkRegistry () : - broker(0), + broker(0), timer(0), parent(0), store(0), passive(false), passiveChanged(false), realm("") { } LinkRegistry::LinkRegistry (Broker* _broker) : - broker(_broker), - parent(0), store(0), passive(false), passiveChanged(false), + broker(_broker), timer(&broker->getTimer()), + parent(0), store(0), passive(false), passiveChanged(false), realm(broker->getOptions().realm) { - timer.add (new Periodic(*this)); + timer->add (new Periodic(*this)); } LinkRegistry::Periodic::Periodic (LinkRegistry& _links) : @@ -61,7 +61,7 @@ void LinkRegistry::Periodic::fire () { links.periodicMaintenance (); - links.timer.add (new Periodic(links)); + links.timer->add (new Periodic(links)); } void LinkRegistry::periodicMaintenance () Modified: qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.h?rev=799274&r1=799273&r2=799274&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.h (original) +++ qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.h Thu Jul 30 14:06:55 2009 @@ -62,7 +62,7 @@ qpid::sys::Mutex lock; Broker* broker; - sys::Timer timer; + sys::Timer* timer; management::Manageable* parent; MessageStore* store; bool passive; Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp?rev=799274&r1=799273&r2=799274&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp (original) +++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp Thu Jul 30 14:06:55 2009 @@ -62,7 +62,6 @@ ManagementAgent::~ManagementAgent () { - timer.stop(); { Mutex::ScopedLock lock (userLock); @@ -90,9 +89,10 @@ dataDir = _dataDir; interval = _interval; broker = _broker; + timer = &_broker->getTimer(); threadPoolSize = _threads; ManagementObject::maxThreads = threadPoolSize; - timer.add (new Periodic(*this, interval)); + timer->add (new Periodic(*this, interval)); // Get from file or generate and save to file. if (dataDir.empty()) @@ -219,7 +219,7 @@ void ManagementAgent::Periodic::fire () { - agent.timer.add (intrusive_ptr<TimerTask> (new Periodic (agent, agent.interval))); + agent.timer->add (new Periodic (agent, agent.interval)); agent.periodicProcessing (); } Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h?rev=799274&r1=799273&r2=799274&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h (original) +++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h Thu Jul 30 14:06:55 2009 @@ -183,12 +183,12 @@ framing::Uuid uuid; sys::Mutex addLock; sys::Mutex userLock; - qpid::sys::Timer timer; qpid::broker::Exchange::shared_ptr mExchange; qpid::broker::Exchange::shared_ptr dExchange; std::string dataDir; uint16_t interval; qpid::broker::Broker* broker; + qpid::sys::Timer* timer; uint16_t bootSequence; uint32_t nextObjectId; uint32_t brokerBank; --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org