JavaCL: lightweight user events

ochafik · ochafik · commit 094aed0fd4c2 · 2012-06-24T18:49:04.000+01:00
diff --git a/Core/src/main/java/com/nativelibs4java/opencl/CLEvent.java b/Core/src/main/java/com/nativelibs4java/opencl/CLEvent.java
@@ -128,10 +128,10 @@ public void apply(OpenCLLibrary.cl_event evt, int executionStatus, Pointer voidP
     	}
     }
     
-    static CLEvent createEvent(final CLQueue queue, cl_event evt) {
+    static CLEvent createEvent(final CLQueue queue, long evt) {
     		return createEvent(queue, evt, false);
     }
-	static CLEvent createEvent(final CLQueue queue, cl_event evt, boolean isUserEvent) {
+	static CLEvent createEvent(final CLQueue queue, long evt, boolean isUserEvent) {
 		if (evt == null)
 			return null;
 
diff --git a/Core/src/main/java/com/nativelibs4java/opencl/CLPlatform.java b/Core/src/main/java/com/nativelibs4java/opencl/CLPlatform.java
@@ -333,13 +333,13 @@ static Map<ContextProperties, Object> getGLContextProperties(CLPlatform platform
             Pointer<?> dc = OpenGLContextUtils.wglGetCurrentDC();
             out.put(ContextProperties.GLContext, context.getPeer());
             out.put(ContextProperties.WGLHDC, dc.getPeer());
-            out.put(ContextProperties.Platform, platform.getEntity().getPeer());
+            out.put(ContextProperties.Platform, platform.getEntityPeer());
         } else if (Platform.isUnix()) {
             Pointer<?> context = OpenGLContextUtils.glXGetCurrentContext();
             Pointer<?> dc = OpenGLContextUtils.glXGetCurrentDisplay();
             out.put(ContextProperties.GLContext, context.getPeer());
             out.put(ContextProperties.GLXDisplay, dc.getPeer());
-            out.put(ContextProperties.Platform, platform.getEntity().getPeer());
+            out.put(ContextProperties.Platform, platform.getEntityPeer());
         } else
             throw new UnsupportedOperationException("Current GL context retrieval not implemented on this platform !");
         
diff --git a/Core/src/main/java/com/nativelibs4java/opencl/CLQueue.java b/Core/src/main/java/com/nativelibs4java/opencl/CLQueue.java
@@ -178,7 +178,7 @@ public CLEvent enqueueAcquireGLObjects(CLMem[] objects, CLEvent... eventsToWaitF
         Pointer<cl_event> eventOut = CLEvent.new_event_out(eventsToWaitFor);
 		Pointer<cl_mem> mems = allocateTypedPointers(cl_mem.class, objects.length);
 		for (int i = 0; i < objects.length; i++)
-			mems.set(i, objects[i].getEntity());
+			mems.setSizeTAtOffset(i * Pointer.SIZE, objects[i].getEntityPeer());
 		Pointer<cl_event> evts = CLEvent.to_cl_event_array(eventsToWaitFor);
         error(CL.clEnqueueAcquireGLObjects(getEntity(), objects.length, mems, evts == null ? 0 : (int)evts.getValidElements(), evts, eventOut));
 		return CLEvent.createEventFromPointer(this, eventOut);
diff --git a/Core/src/main/java/com/nativelibs4java/opencl/CLUserEvent.java b/Core/src/main/java/com/nativelibs4java/opencl/CLUserEvent.java
@@ -37,7 +37,7 @@
 import com.nativelibs4java.opencl.library.OpenCLLibrary.cl_event;
 
 public class CLUserEvent extends CLEvent {
-	CLUserEvent(cl_event evt) { 
+	CLUserEvent(long evt) { 
 		super(evt);
 	}
 	/**
@@ -46,7 +46,7 @@ public class CLUserEvent extends CLEvent {
 	 * @param executionStatus specifies the new execution status to be set and can be CL_COMPLETE or a negative integer value to indicate an error. A negative integer value causes all enqueued commands that wait on this user event to be terminated.	setStatus can only be called once to change the execution status of event.
 	 */
 	public void setStatus(int executionStatus) {
-		error(CL.clSetUserEventStatus(getEntity(), executionStatus));
+		error(CL.clSetUserEventStatus(getEntityPeer(), executionStatus));
 	}
 	
 	/**
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLContext.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLContext.java
@@ -191,7 +191,7 @@ public CLEvent createUserEvent() {
 		try {
 			ReusablePointers ptrs = ReusablePointers.get();
 			Pointer<Integer> pErr = ptrs.pErr;
-			cl_event evt = CL.clCreateUserEvent(getEntity(), pErr);
+			long evt = CL.clCreateUserEvent(getEntity(), pErr);
 			error(pErr.getInt());
 			return CLEvent.createEvent(null, evt, true);
 		} catch (Throwable th) {
diff --git a/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/library/OpenCLLibrary.java b/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/library/OpenCLLibrary.java
@@ -687,6 +687,7 @@ public static abstract class clSetMemObjectDestructorAPPLE_arg1_callback extends
 	public native int clReleaseEvent(@Ptr long cl_event1);
 	/// Original signature : <code>cl_int clSetUserEventStatus(cl_event, cl_int)</code>
 	public native int clSetUserEventStatus(OpenCLLibrary.cl_event cl_event1, int cl_int1);
+	public native int clSetUserEventStatus(@Ptr long cl_event1, int cl_int1);
 	/// Original signature : <code>cl_int clSetEventCallback(cl_event, cl_int, clSetEventCallback_arg1_callback, void*)</code>
 	public native int clSetEventCallback(OpenCLLibrary.cl_event cl_event1, int cl_int1, Pointer<OpenCLLibrary.clSetEventCallback_arg1_callback > arg1, Pointer<? > voidPtr1);
 	/**

Original file line number	Diff line number	Diff line change
`@@ -128,10 +128,10 @@ public void apply(OpenCLLibrary.cl_event evt, int executionStatus, Pointer voidP`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`
`131`		`- static CLEvent createEvent(final CLQueue queue, cl_event evt) {`
	`131`	`+ static CLEvent createEvent(final CLQueue queue, long evt) {`
`132`	`132`	`return createEvent(queue, evt, false);`
`133`	`133`	`}`
`134`		`- static CLEvent createEvent(final CLQueue queue, cl_event evt, boolean isUserEvent) {`
	`134`	`+ static CLEvent createEvent(final CLQueue queue, long evt, boolean isUserEvent) {`
`135`	`135`	`if (evt == null)`
`136`	`136`	`return null;`
`137`	`137`