Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementExchange.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementExchange.h?rev=773570&r1=773569&r2=773570&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/management/ManagementExchange.h (original) +++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementExchange.h Mon May 11 14:16:52 2009 @@ -22,7 +22,7 @@ #define _ManagementExchange_ #include "qpid/broker/TopicExchange.h" -#include "ManagementBroker.h" +#include "ManagementAgent.h" namespace qpid { namespace broker { @@ -30,15 +30,15 @@ class ManagementExchange : public virtual TopicExchange { private: - management::ManagementBroker* managementAgent; + management::ManagementAgent* managementAgent; public: static const std::string typeName; - ManagementExchange (const string& name, Manageable* _parent = 0); + ManagementExchange (const string& name, Manageable* _parent = 0, Broker* broker = 0); ManagementExchange (const string& _name, bool _durable, const qpid::framing::FieldTable& _args, - Manageable* _parent = 0); + Manageable* _parent = 0, Broker* broker = 0); virtual std::string getType() const { return typeName; } @@ -50,7 +50,7 @@ const string& routingKey, const qpid::framing::FieldTable* args); - void setManagmentAgent (management::ManagementBroker* agent); + void setManagmentAgent (management::ManagementAgent* agent); virtual ~ManagementExchange(); };
Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.cpp?rev=773570&r1=773569&r2=773570&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.cpp (original) +++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.cpp Mon May 11 14:16:52 2009 @@ -21,7 +21,6 @@ #include "Manageable.h" #include "ManagementObject.h" -#include "qpid/agent/ManagementAgent.h" #include "qpid/framing/FieldTable.h" #include "qpid/sys/Thread.h" @@ -156,6 +155,7 @@ }} +int ManagementObject::maxThreads = 1; int ManagementObject::nextThreadIndex = 0; void ManagementObject::writeTimestamps (framing::Buffer& buf) @@ -176,7 +176,7 @@ if (thisIndex == -1) { sys::Mutex::ScopedLock mutex(accessLock); thisIndex = nextThreadIndex; - if (nextThreadIndex < agent->getMaxThreads() - 1) + if (nextThreadIndex < maxThreads - 1) nextThreadIndex++; } return thisIndex; Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.h?rev=773570&r1=773569&r2=773570&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.h (original) +++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.h Mon May 11 14:16:52 2009 @@ -32,7 +32,6 @@ namespace management { class Manageable; -class ManagementAgent; class ObjectId; @@ -111,7 +110,7 @@ class ManagementObject : public ManagementItem { - protected: +protected: uint64_t createTime; uint64_t destroyTime; @@ -122,8 +121,6 @@ bool deleted; Manageable* coreObject; sys::Mutex accessLock; - ManagementAgent* agent; - int maxThreads; uint32_t flags; static int nextThreadIndex; @@ -133,13 +130,14 @@ QPID_COMMON_EXTERN void writeTimestamps(qpid::framing::Buffer& buf); public: + static int maxThreads; typedef void (*writeSchemaCall_t) (qpid::framing::Buffer&); - ManagementObject(ManagementAgent* _agent, Manageable* _core) : + ManagementObject(Manageable* _core) : createTime(uint64_t(qpid::sys::Duration(qpid::sys::now()))), destroyTime(0), updateTime(createTime), configChanged(true), instChanged(true), deleted(false), - coreObject(_core), agent(_agent), forcePublish(false) {} + coreObject(_core), forcePublish(false) {} virtual ~ManagementObject() {} virtual writeSchemaCall_t getWriteSchemaCall() = 0; --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:[email protected]
