From a51372142a8612b40d71227ffacad8a64cc300ea Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Fri, 10 Jul 2009 21:42:19 +0000 Subject: Change remaining broker Timer clients to use the single broker Timer git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@793122 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/management/ManagementAgent.cpp | 6 +++--- cpp/src/qpid/management/ManagementAgent.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cpp/src/qpid/management') diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/cpp/src/qpid/management/ManagementAgent.cpp index ca9f6b11e3..76859dd77f 100644 --- a/cpp/src/qpid/management/ManagementAgent.cpp +++ b/cpp/src/qpid/management/ManagementAgent.cpp @@ -61,7 +61,6 @@ ManagementAgent::ManagementAgent () : ManagementAgent::~ManagementAgent () { - timer.stop(); { Mutex::ScopedLock lock (userLock); @@ -89,9 +88,10 @@ void ManagementAgent::configure(const string& _dataDir, uint16_t _interval, 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 @@ ManagementAgent::Periodic::~Periodic () {} void ManagementAgent::Periodic::fire () { - agent.timer.add (intrusive_ptr (new Periodic (agent, agent.interval))); + agent.timer->add (new Periodic (agent, agent.interval)); agent.periodicProcessing (); } diff --git a/cpp/src/qpid/management/ManagementAgent.h b/cpp/src/qpid/management/ManagementAgent.h index 05a39d6fd5..ca89c1f8fb 100644 --- a/cpp/src/qpid/management/ManagementAgent.h +++ b/cpp/src/qpid/management/ManagementAgent.h @@ -183,12 +183,12 @@ private: 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; -- cgit v1.2.1