Author: astitcher
Date: Fri Jul 10 21:42:19 2009
New Revision: 793122
URL: http://svn.apache.org/viewvc?rev=793122&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=793122&r1=793121&r2=793122&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h Fri Jul 10 21:42:19 2009
@@ -119,6 +119,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;
@@ -129,7 +130,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=793122&r1=793121&r2=793122&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp Fri Jul 10 21:42:19
2009
@@ -36,8 +36,10 @@
#define LINK_MAINT_INTERVAL 2
-LinkRegistry::LinkRegistry (Broker* _broker) : broker(_broker), parent(0),
store(0), passive(false), passiveChanged(false),
- realm(broker ?
broker->getOptions().realm : "")
+LinkRegistry::LinkRegistry (Broker* _broker) :
+ broker(_broker), timer(broker->getTimer()),
+ parent(0), store(0), passive(false), passiveChanged(false),
+ realm(broker ? broker->getOptions().realm : "")
{
timer.add (new Periodic(*this));
}
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=793122&r1=793121&r2=793122&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.h Fri Jul 10 21:42:19 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=793122&r1=793121&r2=793122&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp Fri Jul 10
21:42:19 2009
@@ -61,7 +61,6 @@
ManagementAgent::~ManagementAgent ()
{
- timer.stop();
{
Mutex::ScopedLock lock (userLock);
@@ -89,9 +88,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())
@@ -218,7 +218,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=793122&r1=793121&r2=793122&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h Fri Jul 10
21:42:19 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
