Simpler and direct raw malloc, realloc, free calls

Author: chrisseaton

lib/truffle/truffle/fiddle_backend.rb

@@ -154,17 +154,15 @@ def self.dlunwrap(*args)
   end
 
   def self.malloc(size)
-    ptr = Truffle::FFI::MemoryPointer.new(size)
-    ptr.autorelease = false
-    ptr.to_i
+    Truffle.invoke_primitive :pointer_raw_malloc, size
   end
 
-  def self.realloc(*args)
-    raise 'not implemented'
+  def self.realloc(address, size)
+    Truffle.invoke_primitive :pointer_raw_realloc, address, size
   end
 
-  def self.free(*args)
-    raise 'not implemented'
+  def self.free(address)
+    Truffle.invoke_primitive :pointer_raw_free, address
   end
 
   class Function

src/main/java/org/truffleruby/cext/ValueWrapperManager.java

@@ -117,7 +117,7 @@ public void addFinalizer(ValueWrapper wrapper, Pointer handle) {
     private Runnable createFinalizer(Pointer handle) {
         return () -> {
             this.removeFromHandleMap(handle.getAddress());
-            handle.freeNoAutorelease();
+            handle.free();
         };
 
     }

src/main/java/org/truffleruby/core/support/IONodes.java

@@ -490,7 +490,7 @@ public static Pointer getBuffer(RubyContext context, long size) {
             if (buffer.getSize() >= size) {
                 return buffer;
             } else {
-                buffer.freeNoAutorelease();
+                buffer.free();
                 final Pointer newBuffer = Pointer.malloc(Math.max(size * 2, 1024));
                 Layouts.THREAD.setIoBuffer(rubyThread, newBuffer);
                 return newBuffer;

src/main/java/org/truffleruby/core/thread/ThreadManager.java

@@ -337,7 +337,7 @@ public void cleanup(DynamicObject thread, Thread javaThread) {
         final FiberManager fiberManager = Layouts.THREAD.getFiberManager(thread);
         fiberManager.shutdown(javaThread);
 
-        Layouts.THREAD.getIoBuffer(thread).freeNoAutorelease();
+        Layouts.THREAD.getIoBuffer(thread).free();
 
         unregisterThread(thread);
         Layouts.THREAD.setThread(thread, null);

src/main/java/org/truffleruby/extra/ffi/Pointer.java

@@ -60,6 +60,10 @@ public Pointer(long address, long size) {
         this.size = size;
     }
 
+    public Pointer realloc(long size) {
+        return new Pointer(UNSAFE.reallocateMemory(address, size));
+    }
+
     public void writeByte(long offset, byte b) {
         assert address + offset != 0;
         UNSAFE.putByte(address + offset, b);
@@ -225,17 +229,14 @@ public synchronized void free(FinalizationService finalizationService) {
         UNSAFE.freeMemory(address);
     }
 
-    @TruffleBoundary
-    public synchronized void freeNoAutorelease() {
-        if (autorelease) {
-            throw new UnsupportedOperationException("Calling freeNoAutorelease() on a autorelease Pointer");
-        }
+    public synchronized void free() {
+        assert !autorelease;
         UNSAFE.freeMemory(address);
     }
 
     @Override
     public void close() {
-        freeNoAutorelease();
+        free();
     }
 
     public long getAddress() {

src/main/java/org/truffleruby/extra/ffi/PointerNodes.java

@@ -928,4 +928,35 @@ public DynamicObject writePointer(long address, long value) {
 
     }
 
+    @Primitive(name = "pointer_raw_malloc")
+    public static abstract class PointerRawMallocPrimitiveNode extends PrimitiveArrayArgumentsNode {
+
+        @Specialization
+        public long malloc(long size) {
+            return Pointer.malloc(size).getAddress();
+        }
+
+    }
+
+    @Primitive(name = "pointer_raw_realloc")
+    public static abstract class PointerRawReallocPrimitiveNode extends PrimitiveArrayArgumentsNode {
+
+        @Specialization
+        public long malloc(long address, long size) {
+            return new Pointer(address).realloc(size).getAddress();
+        }
+
+    }
+
+    @Primitive(name = "pointer_raw_free")
+    public static abstract class PointerRawFreePrimitiveNode extends PrimitiveArrayArgumentsNode {
+
+        @Specialization
+        public long free(long address) {
+            new Pointer(address).free();
+            return address;
+        }
+
+    }
+
 }