JavaCL: reuse int[1] eventOut

ochafik · ochafik · commit 555ee447a86b · 2014-01-29T00:09:17.000Z
diff --git a/libraries/OpenCL/Core/src/main/Header.vm b/libraries/OpenCL/Core/src/main/Header.vm
@@ -33,7 +33,7 @@
 #end
 	
 #macro (declareEventsIn)
-	int[] eventsInCount = new int[1];
+	int[] eventsInCount = ptrs.int1Array;
 	Pointer<cl_event> eventsIn = 
 		CLAbstractEntity.copyNonNullEntities(eventsToWaitFor, eventsInCount, ptrs.events_in);
 #end
diff --git a/libraries/OpenCL/Core/src/main/velocity/com/nativelibs4java/opencl/CLAbstractEntity.java b/libraries/OpenCL/Core/src/main/velocity/com/nativelibs4java/opencl/CLAbstractEntity.java
@@ -29,11 +29,11 @@ protected void setEntity(long entityPeer) {
     }
 
     static <T> Pointer<T> copyNonNullEntities(CLAbstractEntity[] entities, int[] countOut, ReusablePointer tmp) {
-		int n;
-		if (entities == null || (n = entities.length) == 0) {
+		if (entities == null) {
 		    countOut[0] = 0;
 			return null;
 		}
+		int n = entities.length;
 		Pointer<T> out = null;
 		
 		int count = 0;
@@ -121,4 +121,4 @@ public boolean equals(Object obj) {
 		return getEntity() == e.getEntity();
 	}
 
-}
+}
diff --git a/libraries/OpenCL/Core/src/main/velocity/com/nativelibs4java/opencl/ReusablePointers.java b/libraries/OpenCL/Core/src/main/velocity/com/nativelibs4java/opencl/ReusablePointers.java
@@ -8,6 +8,8 @@
  * @author ochafik
  */
 final class ReusablePointers {
+	public final int[] int1Array = new int[1];
+
     public final ReusablePointer
             sizeT3_1 = new ReusablePointer(3 * SizeT.SIZE),
             sizeT3_2 = new ReusablePointer(3 * SizeT.SIZE),

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ protected void setEntity(long entityPeer) {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`static <T> Pointer<T> copyNonNullEntities(CLAbstractEntity[] entities, int[] countOut, ReusablePointer tmp) {`
`32`		`- int n;`
`33`		`- if (entities == null \|\| (n = entities.length) == 0) {`
	`32`	`+ if (entities == null) {`
`34`	`33`	`countOut[0] = 0;`
`35`	`34`	`return null;`
`36`	`35`	`}`
	`36`	`+ int n = entities.length;`
`37`	`37`	`Pointer<T> out = null;`
`38`	`38`
`39`	`39`	`int count = 0;`
`@@ -121,4 +121,4 @@ public boolean equals(Object obj) {`
`121`	`121`	`return getEntity() == e.getEntity();`
`122`	`122`	`}`
`123`	`123`
`124`		`-}`
	`124`	`+}`