You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2009/03/26 18:19:58 UTC
svn commit: r758754 - in
/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:
FlowableBaseQueueEntryList.java PriorityQueueEntryList.java
Author: ritchiem
Date: Thu Mar 26 17:19:21 2009
New Revision: 758754
URL: http://svn.apache.org/viewvc?rev=758754&view=rev
Log:
QPID-949 : renamed _disabled to _disableFlowtoDisk based on review feedback
Merge of r758733
Modified:
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FlowableBaseQueueEntryList.java
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueEntryList.java
Modified: qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FlowableBaseQueueEntryList.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FlowableBaseQueueEntryList.java?rev=758754&r1=758753&r2=758754&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FlowableBaseQueueEntryList.java (original)
+++ qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FlowableBaseQueueEntryList.java Thu Mar 26 17:19:21 2009
@@ -51,7 +51,7 @@
private Executor _purger;
private AtomicBoolean _stopped;
private AtomicReference<MessageInhaler> _asynchronousInhaler = new AtomicReference(null);
- protected boolean _disabled;
+ protected boolean _disableFlowToDisk;
private AtomicReference<MessagePurger> _asynchronousPurger = new AtomicReference(null);
private static final int BATCH_PROCESS_COUNT = 100;
@@ -68,7 +68,7 @@
_stopped = new AtomicBoolean(false);
_inhaler = ReferenceCountingExecutorService.getInstance().acquireExecutorService();
_purger = ReferenceCountingExecutorService.getInstance().acquireExecutorService();
- _disabled = true;
+ _disableFlowToDisk = true;
}
public void setFlowed(boolean flowed)
@@ -121,7 +121,7 @@
if (maximumMemoryUsage >= 0)
{
- _disabled = false;
+ _disableFlowToDisk = false;
}
// Don't attempt to start the inhaler/purger unless we have a minimum value specified.
@@ -142,7 +142,7 @@
{
_log.info("Disabling Flow to Disk for queue:" + _queue.getName());
}
- _disabled = true;
+ _disableFlowToDisk = true;
}
}
@@ -166,7 +166,7 @@
{
// If we've increased the minimum memory above what we have in memory then
// we need to inhale more if there is more
- if (!_disabled && _atomicQueueInMemory.get() < _memoryUsageMinimum && _atomicQueueSize.get() > 0)
+ if (!_disableFlowToDisk && _atomicQueueInMemory.get() < _memoryUsageMinimum && _atomicQueueSize.get() > 0)
{
startInhaler();
}
@@ -204,7 +204,7 @@
*/
public void entryUnloadedUpdateMemory(QueueEntry queueEntry)
{
- if (!_disabled && _atomicQueueInMemory.addAndGet(-queueEntry.getSize()) < 0)
+ if (!_disableFlowToDisk && _atomicQueueInMemory.addAndGet(-queueEntry.getSize()) < 0)
{
_log.error("InMemory Count just went below 0:" + queueEntry.debugIdentity());
}
@@ -219,7 +219,7 @@
*/
public void entryLoadedUpdateMemory(QueueEntry queueEntry)
{
- if (!_disabled && _atomicQueueInMemory.addAndGet(queueEntry.getSize()) > _memoryUsageMaximum)
+ if (!_disableFlowToDisk && _atomicQueueInMemory.addAndGet(queueEntry.getSize()) > _memoryUsageMaximum)
{
_log.error("Loaded to much data!:" + _atomicQueueInMemory.get() + "/" + _memoryUsageMaximum);
setFlowed(true);
@@ -247,7 +247,7 @@
_atomicQueueSize.addAndGet(queueEntry.getSize());
long inUseMemory = _atomicQueueInMemory.addAndGet(queueEntry.getSize());
- if (!_disabled && inUseMemory > _memoryUsageMaximum)
+ if (!_disableFlowToDisk && inUseMemory > _memoryUsageMaximum)
{
setFlowed(true);
queueEntry.unload();
Modified: qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueEntryList.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueEntryList.java?rev=758754&r1=758753&r2=758754&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueEntryList.java (original)
+++ qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueEntryList.java Thu Mar 26 17:19:21 2009
@@ -68,7 +68,7 @@
long requriedSize = message.getSize();
// Check and see if list would flow on adding message
- if (!_disabled && !isFlowed() && _priorityLists[index].memoryUsed() + requriedSize > _priorityLists[index].getMemoryUsageMaximum())
+ if (!_disableFlowToDisk && !isFlowed() && _priorityLists[index].memoryUsed() + requriedSize > _priorityLists[index].getMemoryUsageMaximum())
{
if (_log.isDebugEnabled())
{
@@ -401,7 +401,7 @@
if (maximumMemoryUsage >= 0)
{
- _disabled = false;
+ _disableFlowToDisk = false;
}
long share = maximumMemoryUsage / _priorities;
@@ -418,7 +418,7 @@
{
_log.info("Disabling Flow to Disk for queue:" + _queue.getName());
}
- _disabled = true;
+ _disableFlowToDisk = true;
return;
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org