Merge pull request #8804 from tesonep/8655-SurfacePluginDLL-is-crashi…

…ng-with-the-headless-VM-at-restart 8655-SurfacePluginDLL-is-crashing-with-the-headless-VM-at-restart
pharo-project · Mar 19, 2021 · 5c758a7 · 5c758a7
2 parents bd7f1c0 + 48983bb
commit 5c758a7
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 48 deletions.
diff --git a/src/Athens-Cairo/AthensCairoSurface.class.st b/src/Athens-Cairo/AthensCairoSurface.class.st
@@ -208,7 +208,7 @@ AthensCairoSurface class >> findSurface: surfaceId [
 	buf := ByteArray new: 4.  "sizeof(int)"
 
 
-	(self ioFindSurface: surfaceId handle: buf) ifTrue: [
+	(self primFindSurface: surfaceId handle: buf) ifTrue: [
 		^ buf nbUlongAt: 1
 		].
 
@@ -269,59 +269,22 @@ AthensCairoSurface class >> initializeForNewSession [
 ]
 
 { #category : #private }
-AthensCairoSurface class >> ioFindSurface: id dispatch: dispPtr handle: handlePtr [
-"	int ioFindSurface(int surfaceID, sqSurfaceDispatch *fn, int *surfaceHandle);
-		Find the surface with the given ID, and, optionally,
-		the given set of surface functions. The registered handle
-		is returned in surfaceHandle. Return true if successful
-		(e.g., the surface has been found), false otherwise.
-"
+AthensCairoSurface class >> primCreateFromFile: aFileName [
+	^ self ffiCall: #(AthensCairoSurface cairo_image_surface_create_from_png (char* aFileName)) 
 
-	self ffiCall: #( bool ioFindSurface(int id, void * dispPtr, int *handlePtr) ) module: #SurfacePlugin
 ]
 
 { #category : #private }
-AthensCairoSurface class >> ioFindSurface: id handle: handlePtr [
-"	int ioFindSurface(int surfaceID, sqSurfaceDispatch *fn, int *surfaceHandle);
-		Find the surface with the given ID, and, optionally,
+AthensCairoSurface class >> primFindSurface: id handle: handlePtr [
+		"Find the surface with the given ID, and, optionally,
 		the given set of surface functions. The registered handle
 		is returned in surfaceHandle. Return true if successful
-		(e.g., the surface has been found), false otherwise.
-"
-
-	self ffiCall: #( bool ioFindSurface(int id, 0 , int *handlePtr) ) module: #SurfacePlugin
-]
-
-{ #category : #private }
-AthensCairoSurface class >> ioRegisterSurface: aCairoSurfaceHandle dispatch: sqSurfaceDispatchPtr surfaceId: idHolder [
-"
-	int ioRegisterSurface(int surfaceHandle, sqSurfaceDispatch *fn, int *surfaceID);
-
-	Register a new surface with the given handle and
-	the set of surface functions. The new ID is returned
-	in surfaceID. Returns true if successful, false 
-	otherwise.
-
-"
-	self ffiCall: #(bool ioRegisterSurface(void* aCairoSurfaceHandle, void *sqSurfaceDispatchPtr, void *idHolder)) module: #SurfacePlugin
-]
-
-{ #category : #private }
-AthensCairoSurface class >> ioUnregisterSurface: aCairoSurfaceId [
-"
-	ioUnregisterSurface:
-	Unregister the surface with the given id.
-	Returns true if successful, false otherwise. 
-
-"
-
-	self ffiCall: #( int ioUnregisterSurface(ulong aCairoSurfaceId) ) module: #SurfacePlugin
-]
+		(e.g., the surface has been found), false otherwise."
 
-{ #category : #private }
-AthensCairoSurface class >> primCreateFromFile: aFileName [
-	^ self ffiCall: #(AthensCairoSurface cairo_image_surface_create_from_png (char* aFileName)) 
+	<primitive: 'primitiveFindSurface' module: 'SurfacePlugin'>
 
+	"We keep the call to the FFI just in case we are running in an old VM"	
+	^ self ioFindSurface: id handle: handlePtr
 ]
 
 { #category : #private }
@@ -348,6 +311,36 @@ AthensCairoSurface class >> primImageFromData: data width: width height: height
 
 ]
 
+{ #category : #private }
+AthensCairoSurface class >> primRegisterSurface: aCairoSurfaceHandle dispatch: sqSurfaceDispatchPtr surfaceId: idHolder [
+"
+	Register a new surface with the given handle and
+	the set of surface functions. The new ID is returned
+	in surfaceID. Returns true if successful, false 
+	otherwise."
+
+	<primitive: 'primitiveRegisterSurface' module: 'SurfacePlugin'>
+
+	"We keep the call to the FFI just in case we are running in an old VM"	
+
+	^ self ioRegisterSurface: aCairoSurfaceHandle dispatch: sqSurfaceDispatchPtr surfaceId: idHolder
+]
+
+{ #category : #private }
+AthensCairoSurface class >> primUnregisterSurface: aCairoSurfaceId [
+"
+	ioUnregisterSurface:
+	Unregister the surface with the given id.
+	Returns true if successful, false otherwise. 
+
+"
+	<primitive: 'primitiveUnregisterSurface' module: 'SurfacePlugin'>
+
+	"We keep the call to the FFI just in case we are running in an old VM"	
+
+	^ self ioUnregisterSurface: aCairoSurfaceId
+]
+
 { #category : #private }
 AthensCairoSurface class >> primWidth: aWidth height: aHeight [
 	^ self ffiCall: #( AthensCairoSurface cairo_image_surface_create (
@@ -367,7 +360,7 @@ AthensCairoSurface class >> registerSurface: anAthensCairoSurface [
 
 	id := ByteArray new: 4.
 	address := anAthensCairoSurface getHandle.
-	(self ioRegisterSurface: address dispatch: dispatch surfaceId: id)
+	(self primRegisterSurface: address dispatch: dispatch surfaceId: id)
 		ifFalse: [ self error: 'Unable to register surface with SurfacePlugin' ].
 	id := id signedLongAt: 1.
 
@@ -377,7 +370,7 @@ AthensCairoSurface class >> registerSurface: anAthensCairoSurface [
 { #category : #private }
 AthensCairoSurface class >> unregisterSurfaceWithId: anAthensCairoSurfaceId [
 
-	self ioUnregisterSurface: anAthensCairoSurfaceId
+	self primUnregisterSurface: anAthensCairoSurfaceId
 ]
 
 { #category : #'instance creation' }

diff --git a/src/Deprecated90/AthensCairoSurface.extension.st b/src/Deprecated90/AthensCairoSurface.extension.st
@@ -0,0 +1,45 @@
+Extension { #name : #AthensCairoSurface }
+
+{ #category : #'*Deprecated90' }
+AthensCairoSurface class >> ioFindSurface: id handle: handlePtr [
+"	int ioFindSurface(int surfaceID, sqSurfaceDispatch *fn, int *surfaceHandle);
+		Find the surface with the given ID, and, optionally,
+		the given set of surface functions. The registered handle
+		is returned in surfaceHandle. Return true if successful
+		(e.g., the surface has been found), false otherwise.
+"
+
+	"This is deprecated... We should use the plugin. Mixing FFI calls and Primitive calls breaks the guarantees of the initialization of plugins."
+
+	self ffiCall: #( bool ioFindSurface(int id, 0 , int *handlePtr) ) module: #SurfacePlugin
+]
+
+{ #category : #'*Deprecated90' }
+AthensCairoSurface class >> ioRegisterSurface: aCairoSurfaceHandle dispatch: sqSurfaceDispatchPtr surfaceId: idHolder [
+"
+	int ioRegisterSurface(int surfaceHandle, sqSurfaceDispatch *fn, int *surfaceID);
+
+	Register a new surface with the given handle and
+	the set of surface functions. The new ID is returned
+	in surfaceID. Returns true if successful, false 
+	otherwise.
+
+"
+
+	"This is deprecated... We should use the plugin. Mixing FFI calls and Primitive calls breaks the guarantees of the initialization of plugins."
+
+	self ffiCall: #(bool ioRegisterSurface(void* aCairoSurfaceHandle, void *sqSurfaceDispatchPtr, void *idHolder)) module: #SurfacePlugin
+]
+
+{ #category : #'*Deprecated90' }
+AthensCairoSurface class >> ioUnregisterSurface: aCairoSurfaceId [
+"
+	ioUnregisterSurface:
+	Unregister the surface with the given id.
+	Returns true if successful, false otherwise. 
+
+"
+	"This is deprecated... We should use the plugin. Mixing FFI calls and Primitive calls breaks the guarantees of the initialization of plugins."
+
+	self ffiCall: #( int ioUnregisterSurface(ulong aCairoSurfaceId) ) module: #SurfacePlugin
+]