Motivation: We need a new implementation of our new API that supports Java 11, since that is what Netty 5 will most likely baseline on. We also need an implementation that does not rely on Unsafe. This leaves us with ByteBuffer as the underlying currency of memory. Modification: - Add a NioBuffer implementation and associated supporting classes. - The entry-point for this is a new MemoryManagers API, which is used to pick the implementation and provide the on-/off-heap MemoryManager implementations. - Add a mechanism to configure/override which MemoryManagers implementation to use. - The MemoryManagers implementations are service-loadable, so new ones can be discovered at runtime. - The existing MemorySegment based implementation also get a MemoryManagers implementation. - Expand the BufferTest to include all combinations of all implementations. We now run 360.000 tests in BufferTest. - Some common infrastructure, like ArcDrop, is moved to its own package. - Add a module-info.java to control the service loading, and the visibility in the various packages. - Some pom.xml file updates to support our now module based project. Result: We have an implementation that should work on Java 11, but we currently don't build or test on 11. More work needs to happen before that is a reality.
147 lines
4.7 KiB
Java
147 lines
4.7 KiB
Java
/*
|
|
* Copyright 2020 The Netty Project
|
|
*
|
|
* The Netty Project licenses this file to you under the Apache License,
|
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
|
* with the License. You may obtain a copy of the License at:
|
|
*
|
|
* https://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*/
|
|
package io.netty.buffer.api;
|
|
|
|
import io.netty.buffer.api.internal.Statics;
|
|
|
|
import java.lang.invoke.VarHandle;
|
|
import java.nio.ByteOrder;
|
|
import java.util.ArrayList;
|
|
import java.util.concurrent.ConcurrentHashMap;
|
|
import java.util.concurrent.ConcurrentLinkedQueue;
|
|
|
|
import static io.netty.buffer.api.internal.Statics.NO_OP_DROP;
|
|
import static java.lang.invoke.MethodHandles.lookup;
|
|
|
|
class SizeClassedMemoryPool implements BufferAllocator, AllocatorControl, Drop<Buffer> {
|
|
private static final VarHandle CLOSE = Statics.findVarHandle(
|
|
lookup(), SizeClassedMemoryPool.class, "closed", boolean.class);
|
|
private final MemoryManager manager;
|
|
private final ConcurrentHashMap<Integer, ConcurrentLinkedQueue<Object>> pool;
|
|
@SuppressWarnings("unused")
|
|
private volatile boolean closed;
|
|
|
|
protected SizeClassedMemoryPool(MemoryManager manager) {
|
|
this.manager = manager;
|
|
pool = new ConcurrentHashMap<>();
|
|
}
|
|
|
|
@Override
|
|
public Buffer allocate(int size) {
|
|
BufferAllocator.checkSize(size);
|
|
var sizeClassPool = getSizeClassPool(size);
|
|
Object memory = sizeClassPool.poll();
|
|
if (memory != null) {
|
|
return recoverMemoryIntoBuffer(memory)
|
|
.reset()
|
|
.readOnly(false)
|
|
.fill((byte) 0)
|
|
.order(ByteOrder.nativeOrder());
|
|
}
|
|
return createBuf(size, getDrop());
|
|
}
|
|
|
|
protected MemoryManager getMemoryManager() {
|
|
return manager;
|
|
}
|
|
|
|
protected Buffer createBuf(int size, Drop<Buffer> drop) {
|
|
var buf = manager.allocateShared(this, size, drop, null);
|
|
drop.attach(buf);
|
|
return buf;
|
|
}
|
|
|
|
protected Drop<Buffer> getDrop() {
|
|
return new CleanerPooledDrop(this, getMemoryManager(), this);
|
|
}
|
|
|
|
@Override
|
|
public void close() {
|
|
if (CLOSE.compareAndSet(this, false, true)) {
|
|
var capturedExceptions = new ArrayList<Exception>(4);
|
|
pool.forEach((k, v) -> {
|
|
Object memory;
|
|
while ((memory = v.poll()) != null) {
|
|
try {
|
|
dispose(recoverMemoryIntoBuffer(memory));
|
|
} catch (Exception e) {
|
|
capturedExceptions.add(e);
|
|
}
|
|
}
|
|
});
|
|
if (!capturedExceptions.isEmpty()) {
|
|
var exception = new ResourceDisposeFailedException();
|
|
capturedExceptions.forEach(exception::addSuppressed);
|
|
throw exception;
|
|
}
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void drop(Buffer buf) {
|
|
if (closed) {
|
|
dispose(buf);
|
|
return;
|
|
}
|
|
Object mem = manager.unwrapRecoverableMemory(buf);
|
|
var sizeClassPool = getSizeClassPool(manager.capacityOfRecoverableMemory(mem));
|
|
sizeClassPool.offer(mem);
|
|
if (closed) {
|
|
Object memory;
|
|
while ((memory = sizeClassPool.poll()) != null) {
|
|
dispose(recoverMemoryIntoBuffer(memory));
|
|
}
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public String toString() {
|
|
return "SizeClassedMemoryPool";
|
|
}
|
|
|
|
@Override
|
|
public Object allocateUntethered(Buffer originator, int size) {
|
|
var sizeClassPool = getSizeClassPool(size);
|
|
Object memory = sizeClassPool.poll();
|
|
if (memory == null) {
|
|
Buffer untetheredBuf = createBuf(size, NO_OP_DROP);
|
|
memory = manager.unwrapRecoverableMemory(untetheredBuf);
|
|
}
|
|
return memory;
|
|
}
|
|
|
|
@Override
|
|
public void recoverMemory(Object memory) {
|
|
Buffer buf = recoverMemoryIntoBuffer(memory);
|
|
buf.close();
|
|
}
|
|
|
|
private Buffer recoverMemoryIntoBuffer(Object memory) {
|
|
var drop = getDrop();
|
|
var buf = manager.recoverMemory(this, memory, drop);
|
|
drop.attach(buf);
|
|
return buf;
|
|
}
|
|
|
|
private ConcurrentLinkedQueue<Object> getSizeClassPool(int size) {
|
|
return pool.computeIfAbsent(size, k -> new ConcurrentLinkedQueue<>());
|
|
}
|
|
|
|
private void dispose(Buffer buf) {
|
|
manager.drop().drop(buf);
|
|
}
|
|
}
|