QPID-3824 - Additional queue statistics, posix memory statistics, and broker-scope statistics

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1242526 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 308 insertions, 0 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java b/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
index 27345f0a88..4367a04da9 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
+++ b/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
@@ -678,6 +678,204 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
             return (System.currentTimeMillis() - _obj.getCreateTime()) * 1000000L;
         }
 
+        public Long getQueueCount()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getMsgTotalEnqueues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getMsgTotalDequeues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getByteTotalEnqueues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getByteTotalDequeues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getMsgDepth()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getByteDepth()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getMsgPersistEnqueues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getMsgPersistDequeues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getBytePersistEnqueues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getBytePersistDequeues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getMsgTxnEnqueues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getMsgTxnDequeues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getByteTxnEnqueues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getByteTxnDequeues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getMsgFtdEnqueues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getMsgFtdDequeues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getByteFtdEnqueues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getByteFtdDequeues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getMsgFtdDepth()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getByteFtdDepth()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getReleases()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getAcquires()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getDiscardsNoRoute()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getDiscardsTtl()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getDiscardsRing()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getDiscardsLvq()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getDiscardsOverflow()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getDiscardsSubscriber()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getDiscardsPurge()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getReroutes()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getAbandoned()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getAbandonedViaAlt()
+        {
+            // TODO
+            return 0L;
+        }
+
         public BrokerSchema.BrokerClass.EchoMethodResponseCommand echo(final BrokerSchema.BrokerClass.EchoMethodResponseCommandFactory factory,
                                                                        final Long sequence,
                                                                        final String body)
@@ -1064,6 +1262,96 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
             return _obj.getPersistentByteDequeues();
         }
 
+        public Long getMsgFtdEnqueues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getMsgFtdDequeues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getByteFtdEnqueues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getByteFtdDequeues()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getMsgFtdDepth()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getByteFtdDepth()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getReleases()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getAcquires()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getDiscardsTtl()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getDiscardsRing()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getDiscardsLvq()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getDiscardsOverflow()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getDiscardsSubscriber()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getDiscardsPurge()
+        {
+            // TODO
+            return 0L;
+        }
+
+        public Long getReroutes()
+        {
+            // TODO
+            return 0L;
+        }
+
         public Long getConsumerCount()
         {
             return (long) _obj.getConsumerCount();
diff --git a/java/broker/src/xsl/qmf.xsl b/java/broker/src/xsl/qmf.xsl
index 1e98c97466..c45d1e419e 100644
--- a/java/broker/src/xsl/qmf.xsl
+++ b/java/broker/src/xsl/qmf.xsl
@@ -794,9 +794,14 @@ public class <xsl:value-of select="$ClassName"/> extends QMFPackage
 <xsl:when test="$type='objId'">OBJECTREFERENCE</xsl:when>
 <xsl:when test="$type='sstr'">STR8</xsl:when>
 <xsl:when test="$type='lstr'">STR16</xsl:when>
+<xsl:when test="$type='uint8'">UINT8</xsl:when>
 <xsl:when test="$type='uint16'">UINT16</xsl:when>
 <xsl:when test="$type='uint32'">UINT32</xsl:when>
 <xsl:when test="$type='uint64'">UINT64</xsl:when>
+<xsl:when test="$type='int8'">INT8</xsl:when>
+<xsl:when test="$type='int16'">INT16</xsl:when>
+<xsl:when test="$type='int32'">INT32</xsl:when>
+<xsl:when test="$type='int64'">INT64</xsl:when>
 <xsl:when test="$type='uuid'">UUID</xsl:when>
 <xsl:when test="$type='deltaTime'">DELTATIME</xsl:when>    
 <xsl:when test="$type='count32'">UINT32</xsl:when>
@@ -813,9 +818,14 @@ public class <xsl:value-of select="$ClassName"/> extends QMFPackage
             <xsl:when test="$type='objId'"><xsl:value-of select="$referenceType"/>Object</xsl:when>
             <xsl:when test="$type='sstr'">String</xsl:when>
             <xsl:when test="$type='lstr'">String</xsl:when>
+            <xsl:when test="$type='uint8'">Integer</xsl:when>
             <xsl:when test="$type='uint16'">Integer</xsl:when>
             <xsl:when test="$type='uint32'">Long</xsl:when>
             <xsl:when test="$type='uint64'">Long</xsl:when>
+            <xsl:when test="$type='int8'">Integer</xsl:when>
+            <xsl:when test="$type='int16'">Integer</xsl:when>
+            <xsl:when test="$type='int32'">Long</xsl:when>
+            <xsl:when test="$type='int64'">Long</xsl:when>
             <xsl:when test="$type='uuid'">UUID</xsl:when>
             <xsl:when test="$type='deltaTime'">Long</xsl:when>    
             <xsl:when test="$type='count32'">Long</xsl:when>
@@ -831,9 +841,14 @@ public class <xsl:value-of select="$ClassName"/> extends QMFPackage
             <xsl:when test="$type='objId'">writeBin128( <xsl:value-of select="$var"/>.getId() )</xsl:when>
             <xsl:when test="$type='sstr'">writeStr8( <xsl:value-of select="$var"/> )</xsl:when>
             <xsl:when test="$type='lstr'">writeStr16( <xsl:value-of select="$var"/> )</xsl:when>
+            <xsl:when test="$type='uint8'">writeUint8( <xsl:value-of select="$var"/> )</xsl:when>
             <xsl:when test="$type='uint16'">writeUint16( <xsl:value-of select="$var"/> )</xsl:when>
             <xsl:when test="$type='uint32'">writeUint32( <xsl:value-of select="$var"/> )</xsl:when>
             <xsl:when test="$type='uint64'">writeUint64( <xsl:value-of select="$var"/> )</xsl:when>
+            <xsl:when test="$type='int8'">writeInt8( <xsl:value-of select="$var"/> )</xsl:when>
+            <xsl:when test="$type='int16'">writeInt16( <xsl:value-of select="$var"/> )</xsl:when>
+            <xsl:when test="$type='int32'">writeInt32( <xsl:value-of select="$var"/> )</xsl:when>
+            <xsl:when test="$type='int64'">writeInt64( <xsl:value-of select="$var"/> )</xsl:when>
             <xsl:when test="$type='uuid'">writeUuid( <xsl:value-of select="$var"/> )</xsl:when>
             <xsl:when test="$type='deltaTime'">writeUint64( <xsl:value-of select="$var"/> )</xsl:when>    
             <xsl:when test="$type='count32'">writeUint32( <xsl:value-of select="$var"/> )</xsl:when>
@@ -849,9 +864,14 @@ public class <xsl:value-of select="$ClassName"/> extends QMFPackage
             <xsl:when test="$type='objId'">readBin128()</xsl:when>
             <xsl:when test="$type='sstr'">readStr8()</xsl:when>
             <xsl:when test="$type='lstr'">readStr16()</xsl:when>
+            <xsl:when test="$type='uint8'">readUint8()</xsl:when>
             <xsl:when test="$type='uint16'">readUint16()</xsl:when>
             <xsl:when test="$type='uint32'">readUint32()</xsl:when>
             <xsl:when test="$type='uint64'">readUint64()</xsl:when>
+            <xsl:when test="$type='int8'">readInt8()</xsl:when>
+            <xsl:when test="$type='int16'">readInt16()</xsl:when>
+            <xsl:when test="$type='int32'">readInt32()</xsl:when>
+            <xsl:when test="$type='int64'">readInt64()</xsl:when>
             <xsl:when test="$type='uuid'">readUuid()</xsl:when>
             <xsl:when test="$type='deltaTime'">readUint64()</xsl:when>    
             <xsl:when test="$type='count32'">readUint32()</xsl:when>