From 52f22489357f604aa8d5e6615f2dfe4a06eadf0c Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 15 Oct 2012 21:35:38 +0000 Subject: MQPID-4286: QMF queries for HA replication take too long to process (Jason Dillaman) Rework ManagementAgent locks, get rid of shared buffers that were points of contention. Minor log message improvements in ha code. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1398530 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/include/qpid/management/Manageable.h | 2 +- cpp/include/qpid/management/ManagementObject.h | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'cpp/include/qpid') diff --git a/cpp/include/qpid/management/Manageable.h b/cpp/include/qpid/management/Manageable.h index 1e5cd8bc42..fd1e604f58 100644 --- a/cpp/include/qpid/management/Manageable.h +++ b/cpp/include/qpid/management/Manageable.h @@ -55,7 +55,7 @@ class QPID_COMMON_EXTERN Manageable // // This accessor function returns a pointer to the management object. // - virtual ManagementObject* GetManagementObject(void) const = 0; + virtual ManagementObject::shared_ptr GetManagementObject(void) const = 0; // Every "Manageable" object must implement ManagementMethod. This // function is called when a remote management client invokes a method diff --git a/cpp/include/qpid/management/ManagementObject.h b/cpp/include/qpid/management/ManagementObject.h index 16bf21038c..2aca6fb1c5 100644 --- a/cpp/include/qpid/management/ManagementObject.h +++ b/cpp/include/qpid/management/ManagementObject.h @@ -25,7 +25,7 @@ #include "qpid/management/Mutex.h" #include "qpid/types/Variant.h" - +#include #include #include @@ -155,6 +155,8 @@ protected: QPID_COMMON_EXTERN uint32_t writeTimestampsSize() const; public: + typedef boost::shared_ptr shared_ptr; + QPID_COMMON_EXTERN static const uint8_t MD5_LEN = 16; QPID_COMMON_EXTERN static int maxThreads; //typedef void (*writeSchemaCall_t) (qpid::framing::Buffer&); @@ -227,8 +229,8 @@ protected: //QPID_COMMON_EXTERN void mapDecode(const types::Variant::Map& map); }; -typedef std::map ManagementObjectMap; -typedef std::vector ManagementObjectVector; +typedef std::map ManagementObjectMap; +typedef std::vector ManagementObjectVector; }} -- cgit v1.2.1