Move ThreadedFFI to its own package and basline, disable ThreadedFFI …

…on load
feenkcom · Dec 11, 2019 · d1a6f48 · d1a6f48
1 parent 0cd76d9
commit d1a6f48
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/BaselineOfThreadedFFI/BaselineOfThreadedFFI.class.st b/src/BaselineOfThreadedFFI/BaselineOfThreadedFFI.class.st
@@ -12,10 +12,11 @@ BaselineOfThreadedFFI >> baseline: spec [
 
 		spec postLoadDoIt: #reset.
 
+		spec 
+			baseline: #ThreadedFFIMigration
+				with: [ spec repository: 'github://feenkcom/threadedFFI-Plugin' ].
+
 		spec
-			"ThreadedFFI and ThreadedFFIMigration are interdependent,
-			but ThreadedFFI uses ThreadedFFIMigration during the load"
-			package: 'ThreadedFFIMigration';
 			package: 'ThreadedFFI' with: [ spec requires: #('ThreadedFFIMigration') ];
 			package: 'ThreadedFFI-UFFI' with: [ spec requires: #('ThreadedFFI') ];
 			package: 'ThreadedFFI-Tests' with: [ spec requires: #('ThreadedFFI') ];

diff --git a/src/ThreadedFFIMigration/ThreadedFFIMigration.class.st b/src/ThreadedFFIMigration/ThreadedFFIMigration.class.st
@@ -18,8 +18,8 @@ Class {
 	#name : #ThreadedFFIMigration,
 	#superclass : #Object,
 	#classVars : [
-		'DisableThreadedFFI',
-		'ThreadedFFIAvailable'
+		'ThreadedFFIAvailable',
+		'ThreadedFFIEnabled'
 	],
 	#category : #ThreadedFFIMigration
 }
@@ -29,15 +29,15 @@ ThreadedFFIMigration class >> disableThreadedFFI [
 	"Set the flag forcing Threaded FFI to be disabled"
 	<script>
 
-	DisableThreadedFFI := true.
+	ThreadedFFIEnabled := false.
 ]
 
 { #category : #managing }
 ThreadedFFIMigration class >> enableThreadedFFI [
 	"Clear the flag forcing Threaded FFI to be disabled"
 	<script>
 
-	DisableThreadedFFI := false.
+	ThreadedFFIEnabled := true.
 ]
 
 { #category : #private }
@@ -60,6 +60,7 @@ ThreadedFFIMigration class >> getThreadedFFIAvailable [
 { #category : #'class initialization' }
 ThreadedFFIMigration class >> initialize [ 
 
+	self disableThreadedFFI.
 	SessionManager default
 		registerSystemClassNamed: self name
 		atPriority: 20
@@ -89,8 +90,6 @@ ThreadedFFIMigration class >> startUp: resuming [
 ThreadedFFIMigration class >> threadedFFIAvailable [
 	"Answer a boolean indicating whether to use Threaded FFI"
 
-	"If true, DisableThreadedFFI forces Threaded FFI to be NOT used.
-	Allow for nil value (= false)"
-	DisableThreadedFFI == true ifTrue: [ ^false ].
-	^ThreadedFFIAvailable ifNil: [ ThreadedFFIAvailable := self getThreadedFFIAvailable ]
+	^ThreadedFFIEnabled and: [ ThreadedFFIAvailable 
+		ifNil: [ ThreadedFFIAvailable := self getThreadedFFIAvailable ] ]
 ]