Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding java assert() on bad buffer release, per discussion with Simone and Jesse

This commit is contained in:
Joakim Erdfelt 2012-12-11 16:05:58 -07:00
parent 440d4c4bf4
commit be83cb100d
2 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jetty-io/src/main/java/org/eclipse/jetty/io/MappedByteBufferPool.java
View File

@ -25,12 +25,9 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ConcurrentMap;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
public class MappedByteBufferPool implements ByteBufferPool
{
private static final Logger LOG = Log.getLogger(MappedByteBufferPool.class);
private final ConcurrentMap<Integer, Queue<ByteBuffer>> directBuffers = new ConcurrentHashMap<>();
private final ConcurrentMap<Integer, Queue<ByteBuffer>> heapBuffers = new ConcurrentHashMap<>();
private final int factor;
@ -63,25 +60,18 @@ public class MappedByteBufferPool implements ByteBufferPool
}
BufferUtil.clear(result);
if(LOG.isDebugEnabled()) {
LOG.debug("acquire({}, {}) -> {}", size, direct, BufferUtil.toDetailString(result));
}
return result;
}
@Override
public void release(ByteBuffer buffer)
{
if(LOG.isDebugEnabled()) {
LOG.debug("release({})", BufferUtil.toDetailString(buffer));
}
if (buffer == null)
return; // nothing to do
if (buffer.capacity() < factor)
return; // don't bother keeping track of this buffer (it obviously didn't come from this bytebuffer pool
// validate that this buffer is from this pool
assert((buffer.capacity() % factor) == 0);
int bucket = bucketFor(buffer.capacity());
ConcurrentMap<Integer, Queue<ByteBuffer>> buffers = buffersFor(buffer.isDirect());

37
jetty-io/src/test/java/org/eclipse/jetty/io/MappedByteBufferPoolTest.java
View File

@ -26,7 +26,6 @@ import java.util.Queue;
import java.util.concurrent.ConcurrentMap;
import org.eclipse.jetty.util.StringUtil;
import org.junit.Ignore;
import org.junit.Test;
public class MappedByteBufferPoolTest
@ -83,23 +82,31 @@ public class MappedByteBufferPoolTest
}
/**
* In a scenario where BufferPool is being used, but some edges cases that use ByteBuffer.allocate()
* and then later that buffer is released via the BufferPool, that non acquired buffer can contaminate
* the buffer pool.
* In a scenario where MappedByteBufferPool is being used improperly, such as releasing a buffer that wasn't created/acquired by the MappedByteBufferPool,
* an assertion is tested for.
*/
@Test
public void testReleaseTiny() throws Exception
public void testReleaseAssertion() throws Exception
{
MappedByteBufferPool bufferPool = new MappedByteBufferPool();
int factor = 1024;
MappedByteBufferPool bufferPool = new MappedByteBufferPool(factor);
// Release a few small non-pool buffers
bufferPool.release(ByteBuffer.wrap(StringUtil.getUtf8Bytes("Hello")));
bufferPool.release(ByteBuffer.wrap(StringUtil.getUtf8Bytes("There")));
// acquire small pool
ByteBuffer small = bufferPool.acquire(35, false);
assertThat(small.capacity(), greaterThanOrEqualTo(35));
small.limit(35);
bufferPool.release(small);
try
{
// Release a few small non-pool buffers
bufferPool.release(ByteBuffer.wrap(StringUtil.getUtf8Bytes("Hello")));
/* NOTES:
*
* 1) This test will pass on command line maven build, as its surefire setup uses "-ea" already.
* 2) In Eclipse, goto the "Run Configuration" for this test case.
* Select the "Arguments" tab, and make sure "-ea" is present in the text box titled "VM arguments"
*/
fail("Expected java.lang.AssertionError, do you have '-ea' JVM command line option enabled?");
}
catch (java.lang.AssertionError e)
{
// Expected path.
}
}
}