Packages May 2021

packages@lists.squeakfoundation.org

1 participants
169 discussions

FFI: FFI-CallbacksTests-mt.1.mcz
by commits＠source.squeak.org 26 May '21

26 May '21

Marcel Taeumel uploaded a new version of FFI-CallbacksTests to project FFI: http://source.squeak.org/FFI/FFI-CallbacksTests-mt.1.mcz ==================== Summary ==================== Name: FFI-CallbacksTests-mt.1 Author: mt Time: 26 May 2021, 6:23:09.127788 pm UUID: ca368808-aa20-a94f-8756-cb35faf36504 Ancestors: Adds some tests around callbacks using qsort and bsearch from the C standard library. Complements (and depends on): FFI-Kernel-mt.171 FFI-Callbacks-mt.19 FFI-Tests-mt.50 ==================== Snapshot ==================== SystemOrganization addCategory: #'FFI-CallbacksTests'! TestCase subclass: #FFICallbackTests instanceVariableNames: 'lib externalObjects' classVariableNames: '' poolDictionaries: '' category: 'FFI-CallbacksTests'! ----- Method: FFICallbackTests>>expectedFailures (in category 'failures') ----- expectedFailures ^ #( test02SortArrayOfDoublesRaw "Checked on 32-bit. Coercing checks are too aggressive or just wrong." test04SortArrayOfIntegersRaw "See above." )! ----- Method: FFICallbackTests>>performTest (in category 'running') ----- performTest "Tests should opt-in to have more control." | prior1 prior2 | prior1 := ExternalType useArrayClasses. prior2 := ExternalData extraSizeChecks. [ExternalType useArrayClasses: false. ExternalData extraSizeChecks: true. super performTest] ensure: [ ExternalType useArrayClasses: prior1. ExternalData extraSizeChecks: prior2].! ----- Method: FFICallbackTests>>setUp (in category 'running') ----- setUp super setUp. lib := CStandardLibrary default. externalObjects := OrderedCollection new.! ----- Method: FFICallbackTests>>tearDown (in category 'running') ----- tearDown externalObjects do: [:ea | ea free]. super tearDown.! ----- Method: FFICallbackTests>>test01SortArrayOfDoubles (in category 'tests') ----- test01SortArrayOfDoubles | array unsorted sorted | unsorted := #(0.8332389864879751 0.5043604970280617 0.36114975224430435 0.8103526363890933 0.7802893776251926 0.5329258270112472 0.23437693854303543 0.509741853444245 0.0275989539897884 0.548561613276074). sorted := #(0.0275989539897884 0.23437693854303543 0.36114975224430435 0.5043604970280617 0.509741853444245 0.5329258270112472 0.548561613276074 0.7802893776251926 0.8103526363890933 0.8332389864879751). array := ExternalType double allocate: 10. 1 to: array size do: [:index | array at: index put: (unsorted at: index)]. self deny: (sorted hasEqualElements: array). lib qsort: array compare: [:a :b | (a - b) sign]. self assert: (sorted hasEqualElements: array).! ----- Method: FFICallbackTests>>test02SortArrayOfDoublesRaw (in category 'tests') ----- test02SortArrayOfDoublesRaw ExternalType useArrayClassesDuring: [self test01SortArrayOfDoubles].! ----- Method: FFICallbackTests>>test03SortArrayOfIntegers (in category 'tests') ----- test03SortArrayOfIntegers | array unsorted sorted | unsorted := #(3036962509 3319035228 2533963671 3440375993 2159145233 2156551592 3216768444 3368770086 3413300624 2615411192). sorted := #(2156551592 2159145233 2533963671 2615411192 3036962509 3216768444 3319035228 3368770086 3413300624 3440375993). array := ExternalType int64_t allocate: 10. 1 to: array size do: [:index | array at: index put: (unsorted at: index)]. self deny: (sorted hasEqualElements: array). lib qsort: array compare: [:a :b | (a - b) sign]. self assert: (sorted hasEqualElements: array).! ----- Method: FFICallbackTests>>test04SortArrayOfIntegersRaw (in category 'tests') ----- test04SortArrayOfIntegersRaw ExternalType useArrayClassesDuring: [self test03SortArrayOfIntegers].! ----- Method: FFICallbackTests>>test05SortArrayOfPointers (in category 'tests') ----- test05SortArrayOfPointers "Fill an array with pointers to atomics. Then sort that array. Note that #value reads from and #value: writes into the first element from ExternalData." | type array unsorted sorted | type := ExternalType int32_t. array := type asPointerType allocate: 10. unsorted := #(10 9 1 5 4 3 7 6 2 8). sorted := #(1 2 3 4 5 6 7 8 9 10). 1 to: array size do: [:index | array at: index put: ((externalObjects add: type allocateExternal) value: (unsorted at: index); yourself)]. self deny: (sorted hasEqualElements: (array collect: #value)). lib qsort: array compare: [:a :b | (a value - b value) sign]. self assert: (sorted hasEqualElements: (array collect: #value)).! ----- Method: FFICallbackTests>>test06SortArrayOfStructs (in category 'tests') ----- test06SortArrayOfStructs | array unsorted sorted compare | unsorted := {58@43 . 99@90 . 63@34 . 19@67 . 99@18 . 57@52 . 5@28 . 68@46 . 49@20 . 90@32}. sorted := {5@28 . 19@67 . 49@20 . 57@52 . 58@43 . 63@34 . 68@46 . 90@32 . 99@18 . 99@90}. compare := [:pt1 :pt2 | pt1 = pt2 ifTrue: [0] ifFalse: [ (pt1 x <= pt2 x and: [pt1 x ~= pt2 x or: [pt1 y <= pt2 y]]) ifTrue: [-1] ifFalse: [1]]]. array := FFITestPoint2 allocate: 10. 1 to: array size do: [:index | array at: index put: (FFITestPoint2 fromPoint: (unsorted at: index))]. self deny: (sorted hasEqualElements: (array collect: #asPoint)). lib qsort: array compare: [:ffiPt1 :ffiPt2 | compare value: ffiPt1 asPoint value: ffiPt2 asPoint]. self assert: (sorted hasEqualElements: (array collect: #asPoint)).! ----- Method: FFICallbackTests>>test07FindFirst (in category 'tests') ----- test07FindFirst | array key sorted result | array := ExternalType int32_t allocateExternal: 10. externalObjects add: array. key := ExternalType int32_t allocateExternal. externalObjects add: key. sorted := #(10 22 23 23 39 44 56 57 67 79). 1 to: array size do: [:index | array at: index put: (sorted at: index)]. key value: (sorted at: 7). result := lib bsearch: key in: array compare: [:a :b | (a - b) sign]. self deny: result isNull. self assert: key value equals: result value. self deny: (key ffiIdentical: result). self assert: ((array from: 7 to: 7) ffiIdentical: result). key value: 111. self deny: (sorted includes: key value). result := lib bsearch: key in: array compare: [:a :b | (a - b) sign]. self assert: result isNull.!

1 0

FFI: FFI-Tests-mt.50.mcz
by commits＠source.squeak.org 26 May '21

26 May '21

Marcel Taeumel uploaded a new version of FFI-Tests to project FFI: http://source.squeak.org/FFI/FFI-Tests-mt.50.mcz ==================== Summary ==================== Name: FFI-Tests-mt.50 Author: mt Time: 26 May 2021, 6:20:41.556788 pm UUID: 97fd9a82-3fc1-854d-9f95-d97718d3e9a8 Ancestors: FFI-Tests-mt.49 Complements #asPoint in FFITestPoint2 to be used in tests for convenience. =============== Diff against FFI-Tests-mt.49 =============== Item was added: + ----- Method: FFITestPoint2 class>>fromPoint: (in category 'instance creation') ----- + fromPoint: aPoint + + ^ self new + setX: aPoint x setY: aPoint y; + yourself!

1 0

FFI: FFI-Tools-mt.37.mcz
by commits＠source.squeak.org 26 May '21

26 May '21

Marcel Taeumel uploaded a new version of FFI-Tools to project FFI: http://source.squeak.org/FFI/FFI-Tools-mt.37.mcz ==================== Summary ==================== Name: FFI-Tools-mt.37 Author: mt Time: 26 May 2021, 6:19:46.160788 pm UUID: 5465025e-bcf2-9546-8bc9-f70d9f588e50 Ancestors: FFI-Tools-mt.36 Minor fix for object explorer, which affects closing the tool on a local array of null-pointers such as "ExternalType int32_t asPointerType allocate: 10". =============== Diff against FFI-Tools-mt.36 =============== Item was changed: ----- Method: ExternalData>>explorerOkToClose (in category '*FFI-Tools') ----- explorerOkToClose "Overwritten to also check by content type. That is, a byte array full of pointers is also managed here." + ^ ((handle isExternalAddress and: [self isNull not]) or: [ + self contentType isPointerType and: [self anySatisfy: [:ea | ea isNull not]]]) - ^ ((handle isExternalAddress or: [self contentType isPointerType]) - and: [self isNull not]) ifTrue: [self confirmFree] ifFalse: [true]!

1 0

FFI: FFI-Callbacks-mt.19.mcz
by commits＠source.squeak.org 26 May '21

26 May '21

Marcel Taeumel uploaded a new version of FFI-Callbacks to project FFI: http://source.squeak.org/FFI/FFI-Callbacks-mt.19.mcz ==================== Summary ==================== Name: FFI-Callbacks-mt.19 Author: mt Time: 26 May 2021, 6:18:08.303788 pm UUID: 07f5dc26-d1f1-6549-932e-42693011e920 Ancestors: FFI-Callbacks-mt.18 Adds callback-convenience for bsearch and qsort, which also serve as commentary and examples for other callbacks. Complements FFI-Kernel-mt.171. Moves qsort examples to new FFI-CallbacksTests package. =============== Diff against FFI-Callbacks-mt.18 =============== Item was added: + ----- Method: BlockClosure>>signature: (in category '*FFI-Callbacks') ----- + signature: signature + + ^ FFICallback + signature: signature + block: self! Item was added: + ----- Method: CStandardLibrary>>bsearch:in:compare: (in category '*FFI-Callbacks') ----- + bsearch: key in: array compare: block + + | result | + result := self + bsearch: key + with: array + with: array size + with: array contentType byteSize + with: (self compare: array contentType through: block) thunk. + result + setContentType: array contentType; + setSize: 1. + ^ result! Item was added: + ----- Method: CStandardLibrary>>compare:through: (in category '*FFI-Callbacks') ----- + compare: contentType through: evaluable + "Answers a callback for comparing the given contentType through the given evaluable, i.e., messages sends or blocks. Supports pointer types as contentType." + + <callback: int32_t (*)(const void*, const void*)> + + | argType signature | + self assert: [evaluable numArgs = 2]. + + argType := contentType isPointerType + ifTrue: [(contentType asArrayType: nil)] + ifFalse: [contentType]. + + signature := ((thisContext method pragmaAt: #callback:) argumentAt: 1) copy. + signature at: 2 put: argType asPointerType. + signature at: 3 put: argType asPointerType. + + ^ evaluable signature: signature! Item was added: + ----- Method: CStandardLibrary>>qsort:compare: (in category '*FFI-Callbacks') ----- + qsort: array compare: block + + ^ self + qsort: array + with: array size + with: array contentType byteSize + with: (self compare: array contentType through: block) thunk! Item was removed: - ----- Method: FFICallback class>>cdeclQsort:with:with:with: (in category 'examples') ----- - cdeclQsort: values with: number with: width with: callback - - <cdecl: void 'qsort' (void* size_t size_t void*) module: 'msvcrt.dll'> - ^ self externalCallFailed! Item was removed: - ----- Method: FFICallback class>>exampleCqsort01 (in category 'examples') ----- - exampleCqsort01 - "Call the libc qsort function (which requires a callback)." - "FFICallback exampleCqsort01" - "(Time millisecondsToRun: [100 timesRepeat: [FFICallback exampleCqsort]]) / 100.0" - - | type cb rand nElements values orig sort libcName knownLibcNames fn | - - knownLibcNames := #('libobjc.dylib' 'libgcc_s.1.dylib' 'libc.dylib' 'libc.so.6' 'libc.so' 'msvcrt.dll'). - libcName := Project uiManager chooseFrom: knownLibcNames title: 'Choose your libc'. - libcName = 0 ifTrue: [^ self]. - libcName := knownLibcNames at: libcName. - - rand := Random new. - type := ExternalType double. - nElements := 10. - values := type allocateExternal: nElements. - "Initialize external data and set size for enumeration." - 1 to: nElements do: [:i| values at: i put: rand next]. - "Fetch a local copy of the external data." - orig := values copy. - - "Construct the callback structure." - cb := FFICallback - signature: '<callback: int (*)(double* double*)>' - "signature: #(int 'double*' 'double*')" - block: [ :arg1 :arg2 | - | a b | - a := arg1. - b := arg2. - (a - b) sign]. - - "void qsort( void *base, size_t number, size_t width, int (__cdecl *compare )(const void *, const void *) );" - fn := ExternalLibraryFunction - name: 'qsort' module: libcName - callType: ExternalLibraryFunction callTypeCDecl - returnType: ExternalType void - argumentTypes: (ExternalType lookupTypes: #('void*' size_t size_t 'void*')). - - "Invoke!!" - fn - invokeWith: values "getHandle" - with: nElements - with: type byteSize - with: cb thunk "getHandle". - - sort := values collect: [:each | each]. - values free. - ^orig -> sort! Item was removed: - ----- Method: FFICallback class>>exampleCqsort02 (in category 'examples') ----- - exampleCqsort02 - "Call the libc qsort function (which requires a callback)." - " - FFICallback exampleCqsort02 - " - "(Time millisecondsToRun: [100 timesRepeat: [FFICallback exampleCqsort]]) / 100.0" - - | type rand nElements sizeofDouble values orig sort | - - rand := Random new. - type := ExternalType double. - sizeofDouble := type byteSize. - nElements := 10. - values := type allocateExternal: nElements. - "Initialize external data and set size for enumeration." - 1 to: nElements do: [:i| values at: i put: rand next]. - - "Fetch a local copy of the external data." - orig := values copy. - - "Invoke!!" - self - qsort: values with: values size with: values contentType byteSize - with: [ :arg1 :arg2 | - | a b | - a := arg1. - b := arg2. - (a - b) sign]. - - sort := values copy. - values free. - ^orig -> sort! Item was removed: - ----- Method: FFICallback class>>exampleCqsort03 (in category 'examples') ----- - exampleCqsort03 - "Call the libc qsort function (which requires a callback)." - " - FFICallback exampleCqsort03 - " - "(Time millisecondsToRun: [100 timesRepeat: [FFICallback exampleCqsort]]) / 100.0" - - | type rand nElements values orig sort cb | - - rand := Random new. - type := ExternalType double. - nElements := 10. - values := type allocateExternal: nElements. - "Initialize external data and set size for enumeration." - 1 to: nElements do: [:i| values at: i put: rand next]. - - "Fetch a local copy of the external data." - orig := values copy. - - "Construct the callback structure." - cb := FFICallback - signature: '<callback: int (*)(double* double*)>' - "signature: #(int 'double*' 'double*')" - block: [ :arg1 :arg2 | - | a b | - a := arg1. - b := arg2. - (a - b) sign]. - - - "Invoke!!" - self - cdeclQsort: values with: values size with: values contentType byteSize - with: cb thunk. - - sort := values collect: [:each | each]. - values free. - ^orig -> sort! Item was removed: - ----- Method: FFICallback class>>exampleCqsort04 (in category 'examples') ----- - exampleCqsort04 - " - FFICallback exampleCqsort04 - " - - | type in out fn cb | - type := ExternalType int32_t. - in := type allocateExternal: 10. - 1 to: in size do: [:each | - in at: each put: 100 atRandom]. - - cb := FFICallback - signature: '<callback: int (*)(int32_t* int32_t*)>' - "signature: #(int 'double*' 'double*')" - block: [ :arg1 :arg2 | - | a b | - a := arg1. - b := arg2. - (a - b) sign]. - - fn := ExternalLibraryFunction - name: 'qsort' module: 'msvcrt.dll' - callType: ExternalLibraryFunction callTypeCDecl - returnType: ExternalType void - argumentTypes: (ExternalType lookupTypes: #('void*' size_t size_t 'void*')). - - "Invoke!!" - [fn - invokeWith: in "getHandle" - with: in size - with: in contentType byteSize - with: cb thunk "getHandle"] - ifCurtailed: [in free]. - - out := in copy. - in free. - ^ out! Item was removed: - ----- Method: FFICallback class>>qsort:with:with:with: (in category 'examples') ----- - qsort: values with: number with: width with: block - "Indirection to define the signature for the provided block." - <callback: int (*)(double* double*)> - - | callback | - callback := FFICallback - signature: ((thisContext method pragmaAt: #callback:) argumentAt: 1) - block: block. - - ^ self cdeclQsort: values with: number with: width with: callback thunk!

1 0

FFI: FFI-Kernel-mt.171.mcz
by commits＠source.squeak.org 26 May '21

26 May '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.171.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.171 Author: mt Time: 26 May 2021, 6:14:47.506788 pm UUID: 6d230712-f208-ee49-a387-8a075d9f8732 Ancestors: FFI-Kernel-mt.170 Adds (parts of the) C standard library to be used in examples and tests. Includes a rough guess for the module name across the major platforms. See #guessModuleName. Includes unix-specific #LibC as a synonym for #CStandardLibrary --- which might have to be discussed at some point. Adds functionality check for the C standard library at image start-up time. Makes this check and the FFI check optional through preferences, which are enabled by default. Fixes ExternalData to support #hasEqualElements:, which depends on #isSequenceable, which ExternalData arguably is because of #at:(put:). =============== Diff against FFI-Kernel-mt.170 =============== Item was added: + ExternalLibrary subclass: #CStandardLibrary + instanceVariableNames: '' + classVariableNames: 'ModuleName' + poolDictionaries: '' + category: 'FFI-Kernel-Support'! + + !CStandardLibrary commentStamp: 'mt 5/26/2021 10:08' prior: 0! + The ISO C standard library, also known as "CRT" and "libc." + + Further reading: + https://www.gnu.org/software/libc/ + https://docs.microsoft.com/en-us/cpp/c-runtime-library + https://www.cplusplus.com/reference/clibrary/ + https://www.iso.org/standard/82075.html! Item was added: + ----- Method: CStandardLibrary class>>guessModuleName (in category 'preferences') ----- + guessModuleName + "The the platform's module name for the C library." + + | platform | + platform := FFIPlatformDescription current. + + platform isMacOS ifTrue: [ + ^ platform osVersionMajor >= 11 "Big Sur and beyond" + ifTrue:['libSystem.dylib'] + ifFalse: [platform osVersionMajor >= 10 + ifFalse: ['libc.dylib' "Mac OS 9"] + ifTrue: [platform osVersionMinor >= 7 "at least OS X 10.7 (Lion)" + ifTrue: ['libobjc.dylib'] + ifFalse: [platform osVersionMinor >= 5 "at least Mac OS X 10.5 (Leopard)" + ifTrue: ['libgcc_s.1.dylib'] + ifFalse: ['libc.dylib']]]]]. + + platform isWindows ifTrue: [ + ^ 'msvcrt.dll']. + + platform isUnix ifTrue: [ + ^ platform osVersion = 'linux-gnu' + ifTrue: ['libc.so.6'] + ifFalse: ['libc.so']]. + + ^ nil! Item was added: + ----- Method: CStandardLibrary class>>moduleName (in category 'preferences') ----- + moduleName + <preference: 'C runtime/standard library (aka. CRT and libc)' + categoryList: #('FFI Kernel') + description: 'Name for or path to the ISO/IEC 9899 C standard library.' + type: #String> + ^ ModuleName ifNil: [self guessModuleName]! Item was added: + ----- Method: CStandardLibrary class>>moduleName: (in category 'preferences') ----- + moduleName: nameOrNil + + ModuleName := nameOrNil = String empty ifFalse: [nameOrNil]. + self clearAllCaches. + + "Check the provided name only if overwritten by clients. See #guessModuleName and FFIPlatformDescription class>> #startUp:." + ModuleName ifNotNil: [FFIPlatformDescription checkCStandardLibrary].! Item was added: + ----- Method: CStandardLibrary class>>resetDefault (in category 'instance creation') ----- + resetDefault + "Overwritten to release all function handles." + + super resetDefault. + CStandardLibrary methodsDo: [:m | m externalLibraryName: nil].! Item was added: + ----- Method: CStandardLibrary>>abs: (in category 'stdlib.h - integer arithmetics') ----- + abs: n + "Returns the absolute value of parameter n" + + <cdecl: int32_t abs (int32_t)> + ^ self externalCallFailed ! Item was added: + ----- Method: CStandardLibrary>>bsearch:with:with:with:with: (in category 'stdlib.h - searching and sorting') ----- + bsearch: key with: base with: num with: size with: compar + + <cdecl: void* bsearch (const void*, const void*, size_t, size_t, void*)> + ^ self externalCallFailed ! Item was added: + ----- Method: CStandardLibrary>>qsort:with:with:with: (in category 'stdlib.h - searching and sorting') ----- + qsort: base with: num with: size with: compar + + <cdecl: void qsort (void*, size_t, size_t, void*)> + ^ self externalCallFailed ! Item was added: + ----- Method: ExternalData>>isSequenceable (in category 'testing') ----- + isSequenceable + "The receiver implements #at: and #at:put:." + + ^ true! Item was changed: Object subclass: #FFIPlatformDescription instanceVariableNames: 'name osVersion subtype wordSize endianness' + classVariableNames: 'CheckCStandardLibraryOnStartUp CheckFFIOnStartUp LastPlatform' - classVariableNames: 'LastPlatform' poolDictionaries: '' category: 'FFI-Kernel-Support'! !FFIPlatformDescription commentStamp: 'mt 6/2/2020 15:18' prior: 0! This class stores the information about the current (host) platform. It supports testing instances for platform compatibility and specificity. The entire FFI machinery should go through here, when making platform-specific decisions such as when figuring out the #wordSize for pointers to external memory (i.e., ExternalAddress class >> #new) or when looking up compatible definitions for external pools (i.e., ExternalPool class >> #compatibleResolvedDefinitions). 1. DETECT PLATFORM CHANGE ON STARTUP This class is registered for system startup. It then checks whether the current platform is different from the last one. In that case, a selection of FFI classes gets notified such as ExternalObject and ExternalType. 2. PLATFORM SPECIFICITY Platform descriptions may be unspecific, that is, some of their values may be undefined. For example, (FFIPlatformDescription name: 'unix') creates a valid description but is not specific about #osVersion or #wordSize. When comparing such descriptions, precedence of the platform values are: platform name > osVersion > subtype > wordSize So, if one description has a #name and the other does not, the first one is more specific. If both have #name but only the second one has #osVersion, the second one is more specific. If one has only #wordSize and another one has only #subtype, the second one is more specific because #subtype has a higher precedence than #wordSize. 3. PLATFORM COMPATIBILITY Platform descriptions implement a notion of compatibility, which is coupled to its notion of specificity as mentioned before. Using the same rules of precedence, compatibility is checked by comparing the description's values. If not specificed, compatibility is assumed. If specified, values must match via #= to be regarded compatible. Here is an interesting edge case of two compatible platform descriptions: | p1 p2 | p1 := FFIPlatformDescription name: 'Win32' osVersion: '' subtype: 'IX86' wordSize: nil. p2 := FFIPlatformDescription name: '' osVersion: 'linux-gnu' subtype: '' wordSize: 8. p1 isCompatibleWith: p2. Consequently, the developer has to be careful with unspecific platform descriptions, which are used, for example, in the definitions of external pools. 4. FURTHER READING - all references to FFIPlatformDescription - all senders of #wordSize - class comments of ExternalAddress, ExternalType, ExternalPool, ExternalObject ! Item was added: + ----- Method: FFIPlatformDescription class>>checkCStandardLibrary (in category 'system startup') ----- + checkCStandardLibrary + "Try to use C Standard Library. Warn if not possible." + + [ [self assert: [(CStandardLibrary default abs: -5) = 5] + ] ifError: [:msg | + self notify: 'C standard library not available. Please check module name in preferences.', String cr, String cr, msg] + ] fork. "Do not interrupt the startup list."! Item was added: + ----- Method: FFIPlatformDescription class>>checkCStandardLibraryOnStartUp (in category 'preferences') ----- + checkCStandardLibraryOnStartUp + <preference: 'Check C standard library on start-up' + categoryList: #('FFI Kernel') + description: 'When enabled, performs a simple check of the C standard library when Squeak is resuming.' + type: #Boolean> + ^ CheckCStandardLibraryOnStartUp ifNil: [true]! Item was added: + ----- Method: FFIPlatformDescription class>>checkCStandardLibraryOnStartUp: (in category 'preferences') ----- + checkCStandardLibraryOnStartUp: aBoolean + + CheckCStandardLibraryOnStartUp := aBoolean.! Item was added: + ----- Method: FFIPlatformDescription class>>checkFFIOnStartUp (in category 'preferences') ----- + checkFFIOnStartUp + <preference: 'Check FFI on start-up' + categoryList: #('FFI Kernel') + description: 'When enabled, performs a simple check of the FFI plugin when Squeak is resuming.' + type: #Boolean> + ^ CheckFFIOnStartUp ifNil: [true]! Item was added: + ----- Method: FFIPlatformDescription class>>checkFFIOnStartUp: (in category 'preferences') ----- + checkFFIOnStartUp: aBoolean + + CheckFFIOnStartUp := aBoolean.! Item was changed: ----- Method: FFIPlatformDescription class>>startUp: (in category 'system startup') ----- startUp: resuming "Notify all FFI classes about platform changes." resuming ifTrue: [ LastPlatform in: [:lastPlatform | self newCurrent in: [:currentPlatform | lastPlatform = currentPlatform ifTrue: [ self flag: #discuss. "mt: Maybe add #platformResuming?" ExternalAddress allBeNull. ExternalType cleanupUnusedTypes ] ifFalse: [ LastPlatform := currentPlatform. "Update now. See #current." { ExternalAddress. ExternalType. ExternalStructure. ExternalPool } do: [:cls | cls platformChangedFrom: lastPlatform to: currentPlatform] ]]]. + self checkFFIOnStartUp ifTrue: [self checkFFI]. + self checkCStandardLibraryOnStartUp ifTrue: [self checkCStandardLibrary]].! - self checkFFI].! Item was added: + ----- Method: FFIPlatformDescription>>isMacOS (in category 'testing') ----- + isMacOS + + ^ self name = 'Mac OS'! Item was added: + ----- Method: FFIPlatformDescription>>osVersionBuild (in category 'accessing') ----- + osVersionBuild + "Answers the build version number for the platform. Only defined for macOS and Windows platforms. Usually 0 on Windows platforms." + + ^ (self osVersion findTokens: $.) second! Item was added: + ----- Method: FFIPlatformDescription>>osVersionMajor (in category 'accessing') ----- + osVersionMajor + "Answers the major version number for the platform. Only defined for macOS and Windows platforms." + + | token | + token := (self osVersion findTokens: $.) first. + self isMacOS + ifTrue: [ "e.g. Mac OS 90.3 92.2 109.1 1015.2 1100.0" + ^ ((token beginsWith: '9') + ifTrue: [token first] + ifFalse: [token first: 2]) asInteger]. + ^ token asInteger "e.g. Windows 10.0"! Item was added: + ----- Method: FFIPlatformDescription>>osVersionMinor (in category 'accessing') ----- + osVersionMinor + "Answers the minor version number for the platform. Only defined for macOS." + + | token | + token := (self osVersion findTokens: $.) first. + self isMacOS + ifTrue: [ "e.g. 90.3 92.2 109.1 1015.2 1100.0" + ^ ((token beginsWith: '9') + ifTrue: [token allButFirst: 1] + ifFalse: [token allButFirst: 2]) asInteger]. + ^ nil! Item was added: + CStandardLibrary subclass: #LibC + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'FFI-Kernel-Support'! + + !LibC commentStamp: 'mt 5/26/2021 10:09' prior: 0! + Just a synonym for convenient reference.!

1 0

FFI: FFI-Tools-mt.36.mcz
by commits＠source.squeak.org 26 May '21

26 May '21

Marcel Taeumel uploaded a new version of FFI-Tools to project FFI: http://source.squeak.org/FFI/FFI-Tools-mt.36.mcz ==================== Summary ==================== Name: FFI-Tools-mt.36 Author: mt Time: 26 May 2021, 3:32:10.751346 pm UUID: 8e4974c2-b56b-ce43-835a-63b50d879ece Ancestors: FFI-Tools-mt.35 Complements FFI-Kernel-mt.170. Simplifies Shout styling by re-using standard range-types such as #pragmaKeyword and #comment. No need for #externalFunctionCallingConvention or #module. Even #externalCallTypePointerIndicator might not be necessary. Yet, #externalCallType seems to be a useful range type, though. =============== Diff against FFI-Tools-mt.35 =============== Item was changed: ----- Method: SHParserST80>>callback (in category '*FFI-Tools') ----- callback <pragmaParser> + self scanPast: #pragmaKeyword. + self failUnless: currentToken notNil. - self scanPast: #externalFunctionCallingConvention. + "1) Return type" + currentToken = 'const' + ifTrue: [self scanPast: #comment]. self scanPast: #externalCallType. currentToken = '*' ifTrue: [self scanPast: #externalCallTypePointerIndicator]. + "2) Placeholder for function pointer" + currentTokenFirst == $( ifFalse: [^ self fail]. self scanPast: #string. + currentTokenFirst == $* ifFalse: [^ self fail]. self scanPast: #string. + currentTokenFirst == $) ifFalse: [^ self fail]. self scanPast: #string. + + "3) Argument types" - currentTokenFirst == $( ifFalse: [^ self fail]. self scanNext. - currentTokenFirst == $* ifFalse: [^ self fail]. self scanNext. - currentTokenFirst == $) ifFalse: [^ self fail]. self scanNext. - self failUnless: currentTokenFirst == $(. self scanPast: #leftParenthesis. [currentTokenFirst ~= $)] whileTrue: [ self failUnless: currentToken notNil. + currentToken = 'const' + ifTrue: [self scanPast: #comment] + ifFalse: [self scanPast: #externalCallType]. - self scanPast: #externalCallType. currentToken = '*' ifTrue: [self scanPast: #externalCallTypePointerIndicator]]. self scanPast: #rightParenthesis. + - currentToken = 'module:' - ifTrue: [ - self scanPast: #module. - self parseStringOrSymbol ]. - currentToken = 'error:' ifTrue: [ - self scanPast: #primitive. "there's no rangeType for error" - self currentTokenType == #name - ifTrue: [ self parseTemporary: #patternTempVar ] - ifFalse: [ self parseStringOrSymbol ] ]. self failUnless: currentToken = '>'. self scanPast: #primitiveOrExternalCallEnd! Item was changed: ----- Method: SHParserST80>>parseExternalCall (in category '*FFI-Tools') ----- parseExternalCall + "0) First keyword of pragma e.g., <cdecl: ... module: ... error: ...>" + self addRangeType: #pragmaKeyword. + + "1) Call flags such as 'threaded' " - self addRangeType: #externalFunctionCallingConvention. - [self scanNext. ((Smalltalk at: #ExternalFunction) callingConventionModifierFor: currentToken) notNil] whileTrue. + + "2) Return type" self failUnless: currentToken notNil. + currentToken = 'const' + ifTrue: [self scanPast: #comment]. self scanPast: #externalCallType. currentToken = '*' ifTrue: [self scanPast: #externalCallTypePointerIndicator]. currentToken = '[' ifTrue: ["array types return" self scanPast: #externalCallType. [currentTokenFirst ~= $]] whileTrue: [ self failUnless: currentTokenFirst isDigit. self scanPast: #externalCallType]. self scanPast: #externalCallType]. + + "3) Function name or index" currentTokenFirst isDigit + ifTrue: [self scanPast: #string] + ifFalse: [currentTokenFirst == $' + ifTrue: [self parseString] + ifFalse: [self scanPast: #string]]. + + "4) Argument types" - ifTrue: [self scanPast: #integer] - ifFalse: [ - self failUnless: currentTokenFirst == $'. - self parseString]. self failUnless: currentTokenFirst == $(. self scanPast: #leftParenthesis. [currentTokenFirst ~= $)] whileTrue: [ self failUnless: currentToken notNil. + currentToken = 'const' + ifTrue: [self scanPast: #comment] + ifFalse: [self scanPast: #externalCallType]. - self scanPast: #externalCallType. currentToken = '*' ifTrue: [self scanPast: #externalCallTypePointerIndicator]]. self scanPast: #rightParenthesis. + + "5) Module name" currentToken = 'module:' ifTrue: [ + self scanPast: #pragmaKeyword. - self scanPast: #module. self parseStringOrSymbol ]. + + "6) Error code" currentToken = 'error:' ifTrue: [ + self scanPast: #pragmaKeyword. - self scanPast: #primitive. "there's no rangeType for error" self currentTokenType == #name ifTrue: [ self parseTemporary: #patternTempVar ] ifFalse: [ self parseStringOrSymbol ] ]. self failUnless: currentToken = '>'. self scanPast: #primitiveOrExternalCallEnd!

1 0

FFI: FFI-Tests-mt.49.mcz
by commits＠source.squeak.org 26 May '21

26 May '21

Marcel Taeumel uploaded a new version of FFI-Tests to project FFI: http://source.squeak.org/FFI/FFI-Tests-mt.49.mcz ==================== Summary ==================== Name: FFI-Tests-mt.49 Author: mt Time: 26 May 2021, 3:29:21.849346 pm UUID: 9502c26d-eff5-4641-98ad-d3ee650f08ba Ancestors: FFI-Tests-mt.48 Complements FFI-Kernel-mt.170 =============== Diff against FFI-Tests-mt.48 =============== Item was changed: ----- Method: FFIAllocateTests>>tearDown (in category 'running') ----- tearDown externalObjects do: [:externalObject | externalObjects isExternalObject "i.e. not a RawBitsArray" ifTrue: [ externalObject free. + self checkFree: externalObject]]. + super tearDown.! - self checkFree: externalObject]].! Item was added: + ----- Method: FFITestLibrary class>>ffiTestDecoration (in category 'experiments') ----- + ffiTestDecoration + "Just a mock. Commas and 'const' should be ignored while parsing the signature." + + <cdecl: threaded const void* 'ffiTestDecoration' (void*, const int*, double, const int[], char*) module: 'SqueakFFIPrims'> + ^ self externalCallFailed ! Item was added: + ----- Method: FFITestLibrary class>>ffiTestFunctionByIndex (in category 'experiments') ----- + ffiTestFunctionByIndex + "Just a mock. Functions can be specified by index." + + <cdecl: void 42 (void)> + ^ self externalCallFailed ! Item was added: + ----- Method: FFITestLibrary class>>ffiTestFunctionByString (in category 'experiments') ----- + ffiTestFunctionByString + "Just a mock. Functions can be specified by string." + + <cdecl: void 'ffiTestFunctionByString' (void)> + ^ self externalCallFailed ! Item was added: + ----- Method: FFITestLibrary class>>ffiTestFunctionByToken (in category 'experiments') ----- + ffiTestFunctionByToken + "Just a mock. Functions can be specified by token." + + <cdecl: void ffiTestFunctionByToken (void)> + ^ self externalCallFailed !

1 0

FFI: FFI-Kernel-mt.170.mcz
by commits＠source.squeak.org 26 May '21

26 May '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.170.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.170 Author: mt Time: 26 May 2021, 3:28:49.060346 pm UUID: 9cc52c33-866f-d44a-972c-af0d84acfcc3 Ancestors: FFI-Kernel-mt.169 More flexible parsing of external types in signatures. Skip commas and 'const' when parsing external types. Allow name-by-token in signatures to avoid those extra string quotation characters. Fixes bug that occurred during parsing array types with unknown size, i.e. char[]. =============== Diff against FFI-Kernel-mt.169 =============== Item was changed: ----- Method: Parser>>callback (in category '*FFI-Kernel') ----- callback <pragmaParser> | descriptorClass retType externalName args argType | descriptorClass := ExternalFunction. "Parse return type" self advance. - here = 'const' ifTrue: [self advance]. retType := self externalType: descriptorClass. retType == nil ifTrue:[^self expected:'return type']. "Parse function name or index" externalName := here. (self match: #leftParenthesis) ifFalse:[^self expected:'function pointer (*)']. (self matchToken: #*) ifFalse:[^self expected:'function pointer (*)']. (self match: #rightParenthesis) ifFalse:[^self expected:'function pointer (*)']. (self match: #leftParenthesis) ifFalse:[^self expected:'argument list']. args := WriteStream on: Array new. [self match: #rightParenthesis] whileFalse:[ - here = 'const' ifTrue: [self advance]. - here = ',' ifTrue: [self advance]. argType := self externalType: descriptorClass. argType == nil ifTrue:[^self expected:'argument']. argType isVoid & argType isPointerType not ifFalse:[args nextPut: argType]]. self addPragma: (Pragma keyword: #callback: arguments: {{retType}, args contents}). ^true! Item was changed: ----- Method: Parser>>externalFunctionDeclaration (in category '*FFI-Kernel') ----- externalFunctionDeclaration "Parse the function declaration for a call to an external library. (1) Create an instance of ExternalLibraryFunction and install it as first literal. (2) Add a pragma to primitive call 120. " | descriptorClass callType modifier retType externalName args argType module fn | descriptorClass := cue environment valueOf: #ExternalFunction ifAbsent: [^ false]. callType := descriptorClass callingConventionFor: here. callType == nil ifTrue:[^false]. [modifier := descriptorClass callingConventionModifierFor: token. modifier notNil] whileTrue: [self advance. callType := callType bitOr: modifier]. "Parse return type" self advance. retType := self externalType: descriptorClass. retType == nil ifTrue:[^self expected:'return type']. "Parse function name or index" externalName := here. + (self match: #number) + ifFalse: [ "Consume all tokens as function name" + self advance. + externalName := externalName asSymbol]. - (self match: #string) - ifTrue:[externalName := externalName asSymbol] - ifFalse:[(self match:#number) ifFalse:[^self expected:'function name or index']]. (self match: #leftParenthesis) ifFalse:[^self expected:'argument list']. args := WriteStream on: Array new. [self match: #rightParenthesis] whileFalse:[ argType := self externalType: descriptorClass. argType == nil ifTrue:[^self expected:'argument']. argType isVoid & argType isPointerType not ifFalse:[args nextPut: argType]]. (self matchToken: 'module:') ifTrue:[ module := here. (self match: #string) ifFalse:[^self expected: 'String']. module := module asSymbol]. Smalltalk at: #ExternalLibraryFunction ifPresent:[:xfn| fn := xfn name: externalName module: module callType: callType returnType: retType argumentTypes: args contents. self allocateLiteral: fn. fn beWritableObject. "Undo the read-only setting in litIndex:"]. (self matchToken: 'error:') ifTrue: [| errorCodeVariable | errorCodeVariable := here. (hereType == #string or: [hereType == #word]) ifFalse:[^self expected: 'error code (a variable or string)']. self advance. self addPragma: (Pragma keyword: #primitive:error: arguments: (Array with: 120 with: errorCodeVariable)). fn ifNotNil: [fn setErrorCodeName: errorCodeVariable]] ifFalse: [self addPragma: (Pragma keyword: #primitive: arguments: #(120))]. ^true! Item was changed: ----- Method: Parser>>externalType: (in category '*FFI-Kernel') ----- externalType: descriptorClass + "Parse and return an external type. Ignore leading comma and 'const'." + + | xType typeName isArrayType tokenString | + self matchToken: ','. + self matchToken: 'const'. - "Parse and return an external type" - | xType typeName isArrayType | typeName := here. "Note that pointer token is not yet parsed!!" self advance. (isArrayType := self matchToken: $[) ifTrue: [ + (self matchToken: $]) + ifTrue: [typeName := typeName, '[]'] + ifFalse: [ + typeName := typeName, '[', here, ']'. + self advance. + (self matchToken: $]) ifFalse: [^ self expected: 'closing bracket']]]. - typeName := typeName, '[', here, ']'. - self advance. - self matchToken: $]]. (xType := descriptorClass typeNamed: typeName) ifNil: [ "Raise an error if user is there" self interactive ifTrue: [^nil]. "otherwise go over it silently -- use an unknown struct type" xType := descriptorClass newTypeNamed: typeName]. isArrayType ifTrue: [ - self flag: #todo. "mt: We must send arrays as pointers." xType := xType asPointerType]. + self flag: #todo. "mt: Extra commas are currently merged with pointer indicator as a single token." + tokenString := here asString. + ^ (tokenString first == $*) + ifTrue: [self advance. xType asPointerType] + ifFalse:[(tokenString beginsWith: '**') + ifTrue: [self advance. xType asPointerToPointerType] - ^ (self matchToken: #*) - ifTrue:[xType asPointerType] - ifFalse:[(self matchToken: #**) - ifTrue: [xType asPointerToPointerType] ifFalse: [xType]]!

1 0

FFI: FFI-Tests-mt.48.mcz
by commits＠source.squeak.org 26 May '21

26 May '21

Marcel Taeumel uploaded a new version of FFI-Tests to project FFI: http://source.squeak.org/FFI/FFI-Tests-mt.48.mcz ==================== Summary ==================== Name: FFI-Tests-mt.48 Author: mt Time: 26 May 2021, 11:38:32.557346 am UUID: 3abd90ac-f78e-b542-9442-2942594cc738 Ancestors: FFI-Tests-mt.47 Complements FFI-Kernel-mt.169 (and FFI-Examples-mt.8). =============== Diff against FFI-Tests-mt.47 =============== Item was added: + ----- Method: FFIAllocateExternalTests>>test21ArrayAssureLocal (in category 'tests - array') ----- + test21ArrayAssureLocal + "Copy the array into local (object) memory." + + | original copy | + original := self allocate: ExternalType int32_t size: 5. + copy := original assureLocal. + self deny: original == copy. + self assert: copy assureLocal identical: copy.! Item was added: + ----- Method: FFIAllocateTests>>test20ArrayCopy (in category 'tests - array') ----- + test20ArrayCopy + "Copy the array into a new array." + + | original firstCopy secondCopy | + original := self allocate: ExternalType int32_t size: 5. + firstCopy := original copy. + secondCopy := firstCopy copy. + + firstCopy withIndexDo: [:num :index | firstCopy at: index put: index]. + self assert: #(0 0 0 0 0) equals: (original collect: #yourself). + self assert: #(1 2 3 4 5) equals: (firstCopy collect: #yourself). + self assert: #(0 0 0 0 0) equals: (secondCopy collect: #yourself). + + secondCopy withIndexDo: [:num :index | secondCopy at: index put: index+1]. + self assert: #(0 0 0 0 0) equals: (original collect: #yourself). + self assert: #(1 2 3 4 5) equals: (firstCopy collect: #yourself). + self assert: #(2 3 4 5 6) equals: (secondCopy collect: #yourself). + ! Item was added: + ----- Method: FFIAllocateTests>>test21ArrayAssureLocal (in category 'tests - array') ----- + test21ArrayAssureLocal + "Copy the array into local (object) memory." + + | original copy | + original := self allocate: ExternalType int32_t size: 5. + copy := original assureLocal. + self assert: original identical: copy.! Item was added: + ExternalStructure subclass: #X64TestStruct + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'FFI-Tests-Fixtures'! Item was added: + ----- Method: X64TestStruct class>>fields (in category 'field definition') ----- + fields + "X64TestStruct defineFields" + ^#( + (one 'longlong') + (two 'double') + (three 'longlong') + (four 'double') + (five 'longlong') + (six 'double') + (seven 'longlong') + (eight 'double') + (nine 'longlong') + (ten 'double') + (eleven 'longlong') + (twelve 'double') + (thirteen 'longlong') + (fourteen 'double') + (fifteen 'longlong') + (sixteen 'double') + )! Item was added: + ExternalStructure subclass: #X64TestStruct2 + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'FFI-Tests-Fixtures'! Item was added: + ----- Method: X64TestStruct2 class>>fields (in category 'field definition') ----- + fields + "X64TestStruct2 defineFields" + ^#( + (one #X64TestStruct) + (two #X64TestStruct) + )! Item was added: + ExternalStructure subclass: #X64TestStruct3 + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'FFI-Tests-Fixtures'! Item was added: + ----- Method: X64TestStruct3 class>>fields (in category 'field definition') ----- + fields + "X64TestStruct3 defineFields" + ^#( + (one 'longlong') + (two 'double') + (three 'longlong') + (four 'double') + (five 'longlong') + (six 'double') + (seven 'longlong') + (eight 'double') + (nine 'longlong') + (ten 'double') + (eleven 'longlong') + (twelve 'double') + (thirteen 'longlong') + (fourteen 'double') + (fifteen 'longlong') + (sixteen 'double') + (seventeen #X64TestStruct) + (eighteen #X64TestStruct2) + (nineteen 'X64TestStruct*') + (twenty 'X64TestStruct2*') + )!

1 0

FFI: FFI-Kernel-mt.169.mcz
by commits＠source.squeak.org 26 May '21

26 May '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.169.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.169 Author: mt Time: 26 May 2021, 11:37:11.537346 am UUID: cb1e1e46-ba82-ab45-b4da-779d840cb050 Ancestors: FFI-Kernel-mt.168 Fix #copy in ExternalData to always copy. Provide #assureLocal for that other scenario. =============== Diff against FFI-Kernel-mt.168 =============== Item was added: + ----- Method: ExternalData>>assureLocal (in category 'copying') ----- + assureLocal + + ^ handle isExternalAddress + ifTrue: [self copy] + ifFalse: [self]! Item was changed: ----- Method: ExternalData>>ffiEqual: (in category 'comparing') ----- ffiEqual: other "WARNING!! EXPENSIVE!! We can compare bytes if the types are compatible." (self ffiIdentical: other) ifTrue: [^ true]. self flag: #todo. "mt: Which types are actually compatible? :-)" self externalType asNonPointerType = other externalType asNonPointerType ifFalse: [^ false]. self flag: #todo. "mt: Follow pointers? Detect cycles? Hmmm... :-) See #free as inspiration." + ^ self assureLocal getHandle ffiEqual: other assureLocal getHandle! - ^ self copy getHandle ffiEqual: other copy getHandle! Item was changed: ----- Method: ExternalData>>ffiEqualityHash (in category 'comparing') ----- ffiEqualityHash "WARNING!! EXPENSIVE!!" self ffiIdentityHash + bitXor: self assureLocal getHandle hash! - bitXor: self copy getHandle hash! Item was changed: ----- Method: ExternalData>>postCopy (in category 'copying') ----- postCopy + "Reads all bytes from external into object memory or duplicate the array within object memory. Note that this does not flatten all bytes into a single array by repeatedly calling it." - "Reads all bytes into object memory. Note that this does not flatten all bytes into a single array by repeatedly calling it. Also note that this does only work for an external address. It does not copy what's already in object memory." | bytes | - handle isExternalAddress ifFalse: [^ self]. self sizeCheck. bytes := ByteArray new: self byteSize. 1 to: bytes size do: [:index | bytes basicAt: index put: (handle unsignedByteAt: index)]. handle := bytes. self setType: type. "Change container type from pointer to non-pointer type."!

1 0

← Newer
1
2
3
4
5
6
7
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages May 2021