Removes the cache as it is not in a working state.
This commit is contained in:
parent
e793404f7c
commit
98dedf374c
@ -71,17 +71,11 @@ public abstract class PacketQueue<T>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Whether this {@link PacketQueue} should store the {@code byte[]} or
|
* Whether this {@link PacketQueue} should store the {@code byte[]} or
|
||||||
* {@code T} instances added to it via on of the {@code add} methods (of
|
* {@code T} instances added to it via one of the {@code add} methods (if
|
||||||
* {@code false}), or create and store a copy (if {@code true}).
|
* {@code false}), or create and store a copy (if {@code true}).
|
||||||
*/
|
*/
|
||||||
private final boolean copy;
|
private final boolean copy;
|
||||||
|
|
||||||
/**
|
|
||||||
* A cache optionally used to reduce the allocation of new {@code byte[]}
|
|
||||||
* instances.
|
|
||||||
*/
|
|
||||||
private final Queue<byte[]> cache;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The capacity of this {@link PacketQueue}. If one of the {@code add}
|
* The capacity of this {@link PacketQueue}. If one of the {@code add}
|
||||||
* methods is called while the queue holds this many packets, the first
|
* methods is called while the queue holds this many packets, the first
|
||||||
@ -147,14 +141,12 @@ public abstract class PacketQueue<T>
|
|||||||
public PacketQueue(
|
public PacketQueue(
|
||||||
boolean enableStatistics, String id, PacketHandler<T> packetHandler)
|
boolean enableStatistics, String id, PacketHandler<T> packetHandler)
|
||||||
{
|
{
|
||||||
this(DEFAULT_CAPACITY, true, true, enableStatistics, id, packetHandler);
|
this(DEFAULT_CAPACITY, true, enableStatistics, id, packetHandler);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initializes a new {@link PacketQueue} instance.
|
* Initializes a new {@link PacketQueue} instance.
|
||||||
* @param capacity the capacity of the queue.
|
* @param capacity the capacity of the queue.
|
||||||
* @param enableCache whether caching of unused {@code byte[]} instances
|
|
||||||
* should be enabled.
|
|
||||||
* @param copy whether the queue is to store the instances it is given via
|
* @param copy whether the queue is to store the instances it is given via
|
||||||
* the various {@code add} methods, or create a copy.
|
* the various {@code add} methods, or create a copy.
|
||||||
* @param enableStatistics whether detailed statistics should be calculated
|
* @param enableStatistics whether detailed statistics should be calculated
|
||||||
@ -168,7 +160,7 @@ public abstract class PacketQueue<T>
|
|||||||
* created, and the queue will provide access to the head element via
|
* created, and the queue will provide access to the head element via
|
||||||
* {@link #get()} and {@link #poll()}.
|
* {@link #get()} and {@link #poll()}.
|
||||||
*/
|
*/
|
||||||
public PacketQueue(int capacity, boolean enableCache, boolean copy,
|
public PacketQueue(int capacity, boolean copy,
|
||||||
boolean enableStatistics, String id,
|
boolean enableStatistics, String id,
|
||||||
PacketHandler<T> packetHandler)
|
PacketHandler<T> packetHandler)
|
||||||
{
|
{
|
||||||
@ -180,10 +172,6 @@ public abstract class PacketQueue<T>
|
|||||||
queueStatistics
|
queueStatistics
|
||||||
= enableStatistics ? new QueueStatistics(id) : null;
|
= enableStatistics ? new QueueStatistics(id) : null;
|
||||||
|
|
||||||
cache
|
|
||||||
= enableCache
|
|
||||||
? new ArrayBlockingQueue<byte[]>(CACHE_CAPACITY) : null;
|
|
||||||
|
|
||||||
if (packetHandler != null)
|
if (packetHandler != null)
|
||||||
{
|
{
|
||||||
handler = packetHandler;
|
handler = packetHandler;
|
||||||
@ -322,14 +310,6 @@ public abstract class PacketQueue<T>
|
|||||||
*/
|
*/
|
||||||
private byte[] getByteArray(int len)
|
private byte[] getByteArray(int len)
|
||||||
{
|
{
|
||||||
if (cache != null)
|
|
||||||
{
|
|
||||||
byte[] buf = cache.poll();
|
|
||||||
if (buf != null && buf.length >= len)
|
|
||||||
{
|
|
||||||
return buf;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return new byte[len];
|
return new byte[len];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -358,12 +338,6 @@ public abstract class PacketQueue<T>
|
|||||||
{
|
{
|
||||||
logger.warning(
|
logger.warning(
|
||||||
"Packets dropped (id=" + id + "): " + numDroppedPackets);
|
"Packets dropped (id=" + id + "): " + numDroppedPackets);
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cache != null && copy)
|
|
||||||
{
|
|
||||||
cache.offer(getBuffer(p));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user