You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by pm...@apache.org on 2013/09/06 16:35:16 UTC
svn commit: r1520579 - in /qpid/trunk/qpid/cpp:
managementgen/qmfgen/templates/ src/qpid/broker/ src/qpid/broker/amqp_0_10/
src/qpid/legacystore/ src/qpid/xml/
Author: pmoravec
Date: Fri Sep 6 14:35:15 2013
New Revision: 1520579
URL: http://svn.apache.org/r1520579
Log:
QPID-5107: Trace queue&session deletion statistics show zero values for some counters everytime
Modified:
qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Class.cpp
qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Class.h
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/System.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/System.h
qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Vhost.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Vhost.h
qpid/trunk/qpid/cpp/src/qpid/broker/amqp_0_10/Connection.cpp
qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.cpp
Modified: qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Class.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Class.cpp?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Class.cpp (original)
+++ qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Class.cpp Fri Sep 6 14:35:15 2013
@@ -70,6 +70,16 @@ uint8_t /*MGEN:Class.NameCap*/::md5Sum[M
/*MGEN:Class.NameCap*/::~/*MGEN:Class.NameCap*/ ()
{
+/*MGEN:IF(Class.ExistPerThreadStats)*/
+ for (int idx = 0; idx < maxThreads; idx++)
+ if (perThreadStatsArray[idx] != 0)
+ delete perThreadStatsArray[idx];
+ delete[] perThreadStatsArray;
+/*MGEN:ENDIF*/
+}
+
+void /*MGEN:Class.NameCap*/::debugStats (const std::string& comment)
+{
/*MGEN:IF(Root.GenLogs)*/
bool logEnabled;
QPID_LOG_TEST_CAT(trace, model, logEnabled);
@@ -77,19 +87,14 @@ uint8_t /*MGEN:Class.NameCap*/::md5Sum[M
{
::qpid::types::Variant::Map map;
mapEncodeValues(map, false, true);
- QPID_LOG_CAT(trace, model, "Mgmt delete " << className
+ QPID_LOG_CAT(trace, model, "Mgmt " << comment << ((comment!="")?(" "):("")) << className
<< ". id:" << getKey()
<< " Statistics: " << map);
}
/*MGEN:ENDIF*/
-/*MGEN:IF(Class.ExistPerThreadStats)*/
- for (int idx = 0; idx < maxThreads; idx++)
- if (perThreadStatsArray[idx] != 0)
- delete perThreadStatsArray[idx];
- delete[] perThreadStatsArray;
-/*MGEN:ENDIF*/
}
+
namespace {
const string NAME("name");
const string TYPE("type");
Modified: qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Class.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Class.h?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Class.h (original)
+++ qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Class.h Fri Sep 6 14:35:15 2013
@@ -118,6 +118,8 @@ namespace qmf {
/*MGEN:Root.ExternMethod*/ ~/*MGEN:Class.NameCap*/();
+ void debugStats (const std::string& comment);
+
/*MGEN:Class.SetGeneralReferenceDeclaration*/
/*MGEN:Root.ExternMethod*/ static void registerSelf(
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Fri Sep 6 14:35:15 2013
@@ -443,6 +443,8 @@ void Broker::shutdown() {
}
Broker::~Broker() {
+ if (mgmtObject != 0)
+ mgmtObject->debugStats("destroying");
shutdown();
finalize(); // Finalize any plugins.
if (config.auth)
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp Fri Sep 6 14:35:15 2013
@@ -196,6 +196,9 @@ bool DirectExchange::isBound(Queue::shar
return false;
}
-DirectExchange::~DirectExchange() {}
+DirectExchange::~DirectExchange() {
+ if (mgmtExchange != 0)
+ mgmtExchange->debugStats("destroying");
+}
const std::string DirectExchange::typeName("direct");
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.cpp?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.cpp Fri Sep 6 14:35:15 2013
@@ -353,6 +353,7 @@ Exchange::Binding::Binding(const string&
Exchange::Binding::~Binding ()
{
if (mgmtBinding != 0) {
+ mgmtBinding->debugStats("destroying");
_qmf::Queue::shared_ptr mo = boost::dynamic_pointer_cast<_qmf::Queue>(queue->GetManagementObject());
if (mo != 0)
mo->dec_bindingCount();
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.cpp?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.cpp Fri Sep 6 14:35:15 2013
@@ -117,6 +117,9 @@ bool FanOutExchange::isBound(Queue::shar
}
-FanOutExchange::~FanOutExchange() {}
+FanOutExchange::~FanOutExchange() {
+ if (mgmtExchange != 0)
+ mgmtExchange->debugStats("destroying");
+}
const std::string FanOutExchange::typeName("fanout");
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp Fri Sep 6 14:35:15 2013
@@ -339,7 +339,10 @@ void HeadersExchange::getNonFedArgs(cons
}
}
-HeadersExchange::~HeadersExchange() {}
+HeadersExchange::~HeadersExchange() {
+ if (mgmtExchange != 0)
+ mgmtExchange->debugStats("destroying");
+}
const std::string HeadersExchange::typeName("headers");
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp Fri Sep 6 14:35:15 2013
@@ -223,6 +223,8 @@ Queue::Queue(const string& _name, const
Queue::~Queue()
{
+ if (mgmtObject != 0)
+ mgmtObject->debugStats("destroying");
}
bool Queue::isLocal(const Message& msg)
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp Fri Sep 6 14:35:15 2013
@@ -437,8 +437,10 @@ bool SemanticStateConsumerImpl::checkCre
SemanticStateConsumerImpl::~SemanticStateConsumerImpl()
{
- if (mgmtObject != 0)
+ if (mgmtObject != 0) {
+ mgmtObject->debugStats("destroying");
mgmtObject->resourceDestroy ();
+ }
}
void SemanticState::disable(ConsumerImpl::shared_ptr c)
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp Fri Sep 6 14:35:15 2013
@@ -98,6 +98,8 @@ void SessionState::rollbackTx() {
}
SessionState::~SessionState() {
+ if (mgmtObject != 0)
+ mgmtObject->debugStats("destroying");
asyncCommandCompleter->cancel();
semanticState.closed();
if (mgmtObject != 0)
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/System.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/System.cpp?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/System.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/System.cpp Fri Sep 6 14:35:15 2013
@@ -80,3 +80,9 @@ System::System (string _dataDir, Broker*
}
}
+System::~System ()
+{
+ if (mgmtObject != 0)
+ mgmtObject->debugStats("destroying");
+}
+
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/System.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/System.h?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/System.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/System.h Fri Sep 6 14:35:15 2013
@@ -45,6 +45,8 @@ class System : public management::Manage
System (std::string _dataDir, Broker* broker = 0);
+ ~System ();
+
management::ManagementObject::shared_ptr GetManagementObject(void) const
{ return mgmtObject; }
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp Fri Sep 6 14:35:15 2013
@@ -333,7 +333,10 @@ bool TopicExchange::isBound(Queue::share
return false;
}
-TopicExchange::~TopicExchange() {}
+TopicExchange::~TopicExchange() {
+ if (mgmtExchange != 0)
+ mgmtExchange->debugStats("destroying");
+}
const std::string TopicExchange::typeName("topic");
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Vhost.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Vhost.cpp?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Vhost.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Vhost.cpp Fri Sep 6 14:35:15 2013
@@ -43,6 +43,11 @@ Vhost::Vhost (qpid::management::Manageab
}
}
+Vhost::~Vhost () {
+ if (mgmtObject != 0)
+ mgmtObject->debugStats("destroying");
+}
+
void Vhost::setFederationTag(const std::string& tag)
{
mgmtObject->set_federationTag(tag);
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Vhost.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Vhost.h?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Vhost.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Vhost.h Fri Sep 6 14:35:15 2013
@@ -40,6 +40,8 @@ class Vhost : public management::Managea
Vhost (management::Manageable* parentBroker, Broker* broker = 0);
+ ~Vhost ();
+
management::ManagementObject::shared_ptr GetManagementObject (void) const
{ return mgmtObject; }
void setFederationTag(const std::string& tag);
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/amqp_0_10/Connection.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/amqp_0_10/Connection.cpp?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/amqp_0_10/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/amqp_0_10/Connection.cpp Fri Sep 6 14:35:15 2013
@@ -174,6 +174,7 @@ void Connection::requestIOProcessing(boo
Connection::~Connection()
{
if (mgmtObject != 0) {
+ mgmtObject->debugStats("destroying");
if (!link)
agent->raiseEvent(_qmf::EventClientDisconnect(mgmtId, getUserId(), mgmtObject->get_remoteProperties()));
QPID_LOG_CAT(debug, model, "Delete connection. user:" << getUserId()
Modified: qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp Fri Sep 6 14:35:15 2013
@@ -448,6 +448,8 @@ void MessageStoreImpl::closeDbs()
MessageStoreImpl::~MessageStoreImpl()
{
+ if (mgmtObject.get() != 0)
+ mgmtObject->debugStats("destroying");
finalize();
try {
closeDbs();
Modified: qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.cpp?rev=1520579&r1=1520578&r2=1520579&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.cpp Fri Sep 6 14:35:15 2013
@@ -372,6 +372,8 @@ bool XmlExchange::isBound(Queue::shared_
XmlExchange::~XmlExchange()
{
+ if (mgmtExchange != 0)
+ mgmtExchange->debugStats("destroying");
bindingsMap.clear();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org