You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/11/01 13:26:20 UTC
qpid-broker-j git commit: QPID-8000: [Broker-J] Improve buffer
statistic names.
Repository: qpid-broker-j
Updated Branches:
refs/heads/master c348adfbb -> 31ee9c780
QPID-8000: [Broker-J] Improve buffer statistic names.
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/31ee9c78
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/31ee9c78
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/31ee9c78
Branch: refs/heads/master
Commit: 31ee9c780527eb515eadf3ff94ff615e9662a09f
Parents: c348adf
Author: Keith Wall <kw...@apache.org>
Authored: Wed Nov 1 13:25:24 2017 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Wed Nov 1 13:25:56 2017 +0000
----------------------------------------------------------------------
.../apache/qpid/server/bytebuffer/QpidByteBuffer.java | 8 ++++----
.../qpid/server/bytebuffer/QpidByteBufferFactory.java | 6 +++---
.../main/java/org/apache/qpid/server/model/Broker.java | 10 +++++-----
.../java/org/apache/qpid/server/model/BrokerImpl.java | 12 ++++++------
4 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/31ee9c78/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBuffer.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBuffer.java b/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBuffer.java
index bf7e40c..eb49b56 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBuffer.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBuffer.java
@@ -127,14 +127,14 @@ public interface QpidByteBuffer extends AutoCloseable
return QpidByteBufferFactory.getAllocatedDirectMemorySize();
}
- static int getNumberOfActivePooledBuffers()
+ static int getNumberOfBuffersInUse()
{
- return QpidByteBufferFactory.getNumberOfActivePooledBuffers();
+ return QpidByteBufferFactory.getNumberOfBuffersInUse();
}
- static int getNumberOfPooledBuffers()
+ static int getNumberOfBuffersInPool()
{
- return QpidByteBufferFactory.getNumberOfPooledBuffers();
+ return QpidByteBufferFactory.getNumberOfBuffersInPool();
}
static long getPooledBufferDisposalCounter()
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/31ee9c78/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBufferFactory.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBufferFactory.java b/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBufferFactory.java
index 5b55ff9..32b0ecc 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBufferFactory.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBufferFactory.java
@@ -366,15 +366,15 @@ final class QpidByteBufferFactory
static long getAllocatedDirectMemorySize()
{
- return _pooledBufferSize * getNumberOfActivePooledBuffers();
+ return _pooledBufferSize * getNumberOfBuffersInUse();
}
- static int getNumberOfActivePooledBuffers()
+ static int getNumberOfBuffersInUse()
{
return PooledByteBufferRef.getActiveBufferCount();
}
- static int getNumberOfPooledBuffers()
+ static int getNumberOfBuffersInPool()
{
return _bufferPool.size();
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/31ee9c78/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java b/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
index a10fa55..3223f6d 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
@@ -279,16 +279,16 @@ public interface Broker<X extends Broker<X>> extends ConfiguredObject<X>, EventL
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
units = StatisticUnit.COUNT,
- label = "Number of Active Pooled Buffers",
- description = "Number of pooled buffers in use.")
- long getNumberOfActivePooledBuffers();
+ label = "Number of Buffers In-Use",
+ description = "Number of buffers currently in-use.")
+ long getNumberOfBuffersInUse();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
units = StatisticUnit.COUNT,
label = "Number of Pooled Buffers",
- description = "Number of pooled buffers.")
- long getNumberOfPooledBuffers();
+ description = "Number of buffers currently in the pool.")
+ long getNumberOfBuffersInPool();
@ManagedOperation(nonModifying = true,
description = "Restart the broker within the same JVM",
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/31ee9c78/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
index 69212a3..ad11a7b 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
@@ -838,15 +838,15 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
}
@Override
- public long getNumberOfActivePooledBuffers()
+ public long getNumberOfBuffersInUse()
{
- return QpidByteBuffer.getNumberOfActivePooledBuffers();
+ return QpidByteBuffer.getNumberOfBuffersInUse();
}
@Override
- public long getNumberOfPooledBuffers()
+ public long getNumberOfBuffersInPool()
{
- return QpidByteBuffer.getNumberOfPooledBuffers();
+ return QpidByteBuffer.getNumberOfBuffersInPool();
}
@Override
@@ -1104,7 +1104,7 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
private ListenableFuture<Void> compactMemoryInternal()
{
LOGGER.debug("Compacting direct memory buffers: numberOfActivePooledBuffers: {}",
- QpidByteBuffer.getNumberOfActivePooledBuffers());
+ QpidByteBuffer.getNumberOfBuffersInUse());
final Collection<VirtualHostNode<?>> vhns = getVirtualHostNodes();
List<ListenableFuture<Void>> futures = new ArrayList<>(vhns.size());
@@ -1128,7 +1128,7 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
if (LOGGER.isDebugEnabled())
{
LOGGER.debug("After compact direct memory buffers: numberOfActivePooledBuffers: {}",
- QpidByteBuffer.getNumberOfActivePooledBuffers());
+ QpidByteBuffer.getNumberOfBuffersInUse());
}
resultFuture.set(null);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org