andreacavalli
/
netty-incubator-buffer-api
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add features to MemoryManager 

The ability to allocate a buffer on a sub-region of some recoverable memory will be useful when porting over the arena-based pooling allocator from Netty.
This commit is contained in:
Chris Vest 2021-05-07 16:35:44 +02:00
parent fc7ba4522f
commit e6a238b14d
6 changed files with 54 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/io/netty/buffer/api/MemoryManager.java
View File

@ -23,6 +23,9 @@ public interface MemoryManager {
Drop<Buffer> drop();
Object unwrapRecoverableMemory(Buffer buf);
int capacityOfRecoverableMemory(Object memory);
void discardRecoverableMemory(Object recoverableMemory);
// todo should recoverMemory re-attach a cleaner?
Buffer recoverMemory(AllocatorControl allocatorControl, Object recoverableMemory, Drop<Buffer> drop);
Buffer recoverMemory(AllocatorControl allocatorControl, Object recoverableMemoryBase,
int offset, int length, Drop<Buffer> drop);
}

10
src/main/java/io/netty/buffer/api/SizeClassedMemoryPool.java
View File

@ -82,7 +82,7 @@ class SizeClassedMemoryPool implements BufferAllocator, AllocatorControl, Drop<B
Object memory;
while ((memory = v.poll()) != null) {
try {
dispose(recoverMemoryIntoBuffer(memory));
manager.discardRecoverableMemory(memory);
} catch (Exception e) {
capturedExceptions.add(e);
}
@ -99,7 +99,7 @@ class SizeClassedMemoryPool implements BufferAllocator, AllocatorControl, Drop<B
@Override
public void drop(Buffer buf) {
if (closed) {
dispose(buf);
manager.drop().drop(buf);
return;
}
Object mem = manager.unwrapRecoverableMemory(buf);
@ -108,7 +108,7 @@ class SizeClassedMemoryPool implements BufferAllocator, AllocatorControl, Drop<B
if (closed) {
Object memory;
while ((memory = sizeClassPool.poll()) != null) {
dispose(recoverMemoryIntoBuffer(memory));
manager.discardRecoverableMemory(memory);
}
}
}
@ -145,8 +145,4 @@ class SizeClassedMemoryPool implements BufferAllocator, AllocatorControl, Drop<B
private ConcurrentLinkedQueue<Object> getSizeClassPool(int size) {
return pool.computeIfAbsent(size, k -> new ConcurrentLinkedQueue<>());
}
private void dispose(Buffer buf) {
manager.drop().drop(buf);
}
}

13
src/main/java/io/netty/buffer/api/bytebuffer/ByteBufferMemoryManager.java
View File

@ -65,9 +65,22 @@ public class ByteBufferMemoryManager implements MemoryManager {
return ((ByteBuffer) memory).capacity();
}
@Override
public void discardRecoverableMemory(Object recoverableMemory) {
// ByteBuffers have their memory released by the GC, so there is nothing for us to do.
}
@Override
public Buffer recoverMemory(AllocatorControl allocatorControl, Object recoverableMemory, Drop<Buffer> drop) {
ByteBuffer memory = (ByteBuffer) recoverableMemory;
return new NioBuffer(memory, memory, allocatorControl, convert(drop));
}
@Override
public Buffer recoverMemory(AllocatorControl allocatorControl, Object recoverableMemoryBase,
int offset, int length, Drop<Buffer> drop) {
ByteBuffer memory = (ByteBuffer) recoverableMemoryBase;
memory = memory.slice(offset, length);
return new NioBuffer(memory, memory, allocatorControl, convert(drop));
}
}

18
src/main/java/io/netty/buffer/api/memseg/AbstractMemorySegmentManager.java
View File

@ -21,6 +21,7 @@ import io.netty.buffer.api.Drop;
import io.netty.buffer.api.MemoryManager;
import io.netty.buffer.api.internal.ArcDrop;
import jdk.incubator.foreign.MemorySegment;
import jdk.incubator.foreign.ResourceScope;
import java.lang.ref.Cleaner;
@ -58,9 +59,26 @@ public abstract class AbstractMemorySegmentManager implements MemoryManager {
return (int) ((MemorySegment) memory).byteSize();
}
@Override
public void discardRecoverableMemory(Object recoverableMemory) {
var segment = (MemorySegment) recoverableMemory;
ResourceScope scope = segment.scope();
if (!scope.isImplicit()) {
scope.close();
}
}
@Override
public Buffer recoverMemory(AllocatorControl allocatorControl, Object recoverableMemory, Drop<Buffer> drop) {
var segment = (MemorySegment) recoverableMemory;
return new MemSegBuffer(segment, segment, convert(ArcDrop.acquire(drop)), allocatorControl);
}
@Override
public Buffer recoverMemory(AllocatorControl allocatorControl, Object recoverableMemoryBase,
int offset, int length, Drop<Buffer> drop) {
var segment = (MemorySegment) recoverableMemoryBase;
segment = segment.asSlice(offset, length);
return new MemSegBuffer(segment, segment, convert(ArcDrop.acquire(drop)), allocatorControl);
}
}

4
src/main/java/io/netty/buffer/api/unsafe/UnsafeMemory.java
View File

@ -25,4 +25,8 @@ class UnsafeMemory {
this.address = address;
this.size = size;
}
public UnsafeMemory slice(int offset, int length) {
return new UnsafeMemory(base, address + offset, length);
}
}

13
src/main/java/io/netty/buffer/api/unsafe/UnsafeMemoryManager.java
View File

@ -79,9 +79,22 @@ public class UnsafeMemoryManager implements MemoryManager {
return ((UnsafeMemory) memory).size;
}
@Override
public void discardRecoverableMemory(Object recoverableMemory) {
// We cannot reliably drop unsafe memory. We have to rely on the cleaner to do that.
}
@Override
public Buffer recoverMemory(AllocatorControl allocatorControl, Object recoverableMemory, Drop<Buffer> drop) {
UnsafeMemory memory = (UnsafeMemory) recoverableMemory;
return new UnsafeBuffer(memory, 0, memory.size, allocatorControl, convert(drop));
}
@Override
public Buffer recoverMemory(AllocatorControl allocatorControl, Object recoverableMemoryBase,
int offset, int length, Drop<Buffer> drop) {
UnsafeMemory memory = (UnsafeMemory) recoverableMemoryBase;
memory = memory.slice(offset, length);
return new UnsafeBuffer(memory, 0, memory.size, allocatorControl, convert(drop));
}
}