JavaCL: more faster calls (enqueueBarrier, enqueueMarker, enqueueWaitForEvents)

ochafik · ochafik · commit a768a187c502 · 2012-06-17T14:55:14.000+01:00
diff --git a/Core/src/main/java/com/nativelibs4java/opencl/CLQueue.java b/Core/src/main/java/com/nativelibs4java/opencl/CLQueue.java
@@ -131,9 +131,13 @@ public void flush() {
 	/**
 	 * Enqueues a wait for a specific event or a list of events to complete before any future commands queued in the this queue are executed.
 	 */
-	public void enqueueWaitForEvents(CLEvent... events) {
-        Pointer<cl_event> evts = CLEvent.to_cl_event_array(events);
-        error(CL.clEnqueueWaitForEvents(getEntity(), evts == null ? 0 : (int)evts.getValidElements(), evts));
+	public void enqueueWaitForEvents(CLEvent... eventsToWaitFor) {
+        ReusablePointers ptrs = ReusablePointers.get();
+        int[] eventsCount = new int[1];
+        Pointer<cl_event> events = CLAbstractEntity.copyNonNullEntities(eventsToWaitFor, eventsCount, ptrs.events_in);
+        if (events == null)
+            return;
+        error(CL.clEnqueueWaitForEvents(getPeer(getEntity()), eventsCount[0], getPeer(events)));
 	}
 
 	/**
@@ -142,7 +146,7 @@ public void enqueueWaitForEvents(CLEvent... events) {
 	 * enqueueBarrier() is a synchronization point.
 	 */
 	public void enqueueBarrier() {
-		error(CL.clEnqueueBarrier(getEntity()));
+		error(CL.clEnqueueBarrier(getPeer(getEntity())));
 	}
 
 	/**
@@ -151,8 +155,8 @@ public void enqueueBarrier() {
 	 * @return Event object that identifies this command and can be used to query or queue a wait for the command to complete.
 	 */
 	public CLEvent enqueueMarker() {
-		Pointer<cl_event> eventOut = allocateTypedPointer(cl_event.class);
-		error(CL.clEnqueueMarker(getEntity(), eventOut));
+		Pointer<cl_event> eventOut = ReusablePointers.get().event_out;
+		error(CL.clEnqueueMarker(getPeer(getEntity()), getPeer(eventOut)));
 		return CLEvent.createEventFromPointer(this, eventOut);
 	}
 
diff --git a/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/library/OpenCLLibrary.java b/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/library/OpenCLLibrary.java
@@ -786,10 +786,13 @@ public static abstract class clSetMemObjectDestructorAPPLE_arg1_callback extends
 	public static synchronized native OpenCLLibrary.cl_mem clCreateImage3D(OpenCLLibrary.cl_context cl_context1, long cl_mem_flags1, Pointer<cl_image_format > cl_image_formatPtr1, @Ptr long size_t1, @Ptr long size_t2, @Ptr long size_t3, @Ptr long size_t4, @Ptr long size_t5, Pointer<? > voidPtr1, Pointer<Integer > cl_intPtr1);
 	/// Original signature : <code>cl_int clEnqueueMarker(cl_command_queue, cl_event*)</code>
 	public static synchronized native int clEnqueueMarker(OpenCLLibrary.cl_command_queue cl_command_queue1, Pointer<OpenCLLibrary.cl_event > cl_eventPtr1);
+	public static synchronized native int clEnqueueMarker(@Ptr long cl_command_queue1, @Ptr long cl_eventPtr1);
 	/// Original signature : <code>cl_int clEnqueueWaitForEvents(cl_command_queue, cl_uint, const cl_event*)</code>
 	public static synchronized native int clEnqueueWaitForEvents(OpenCLLibrary.cl_command_queue cl_command_queue1, int cl_uint1, Pointer<OpenCLLibrary.cl_event > cl_eventPtr1);
+	public static synchronized native int clEnqueueWaitForEvents(@Ptr long cl_command_queue1, int cl_uint1, @Ptr long cl_eventPtr1);
 	/// Original signature : <code>cl_int clEnqueueBarrier(cl_command_queue)</code>
 	public static synchronized native int clEnqueueBarrier(OpenCLLibrary.cl_command_queue cl_command_queue1);
+	public static synchronized native int clEnqueueBarrier(@Ptr long cl_command_queue1);
 	/// Original signature : <code>cl_int clUnloadCompiler()</code>
 	public static synchronized native int clUnloadCompiler();
 	/// Original signature : <code>void* clGetExtensionFunctionAddress(const char*)</code>
