浏览代码

Merge pull request #2 from empirephoenix/revert-1-BufferAllocator

Revert "jemalloc allocator and reflection allocator fix"
empirephoenix 9 年之前
父节点
当前提交
5e04039390

+ 0 - 55
jme3-core/src/main/java/com/jme3/util/JemallocAllocator.java

@@ -1,55 +0,0 @@
-package com.jme3.util;
-
-import static org.lwjgl.system.jemalloc.JEmalloc.*;
-
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.DoubleBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.LongBuffer;
-import java.nio.ShortBuffer;
-
-/**
- * This class contains a <code>jemalloc</code> allocator which is a general purpose <code>malloc(3)</code> implementation.
- * <p>
- * <b>LWJGL 3 is required</b> because it includes the jemalloc bindings and binaries.
- * </p>
- */
-public final class JemallocAllocator implements BufferAllocator
-{
-	@Override
-	public void destroyDirectBuffer(Buffer buffer)
-	{
-		if (buffer instanceof ByteBuffer)
-		{
-			je_free((ByteBuffer) buffer);
-		}
-		else if (buffer instanceof ShortBuffer)
-		{
-			je_free((ShortBuffer) buffer);
-		}
-		else if (buffer instanceof IntBuffer)
-		{
-			je_free((IntBuffer) buffer);
-		}
-		else if (buffer instanceof LongBuffer)
-		{
-			je_free((LongBuffer) buffer);
-		}
-		else if (buffer instanceof FloatBuffer)
-		{
-			je_free((FloatBuffer) buffer);
-		}
-		else if (buffer instanceof DoubleBuffer)
-		{
-			je_free((DoubleBuffer) buffer);
-		}
-	}
-
-	@Override
-	public ByteBuffer allocate(int size)
-	{
-		return je_malloc(size);
-	}
-}

+ 1 - 1
jme3-core/src/main/java/com/jme3/util/ReflectionAllocator.java

@@ -60,7 +60,7 @@ public final class ReflectionAllocator implements BufferAllocator {
 		}
 
 		// Apache Harmony
-		ByteBuffer bb = ByteBuffer.allocateDirect(1);
+		ByteBuffer bb = BufferUtils.createByteBuffer(1);
 		Class<?> clazz = bb.getClass();
 		try {
 			freeMethod = clazz.getMethod("free");