Packages August 2021

packages@lists.squeakfoundation.org

1 participants
77 discussions

FFI: FFI-Pools-mt.36.mcz
by commits＠source.squeak.org 19 Aug '21

19 Aug '21

Marcel Taeumel uploaded a new version of FFI-Pools to project FFI: http://source.squeak.org/FFI/FFI-Pools-mt.36.mcz ==================== Summary ==================== Name: FFI-Pools-mt.36 Author: mt Time: 19 August 2021, 10:30:24.310627 am UUID: edf5129c-7376-4d4b-a1c3-b882b1bbcd71 Ancestors: FFI-Pools-mt.35 Prepare ExternalTypePool to also hold genuine atomic types. =============== Diff against FFI-Pools-mt.35 =============== Item was changed: ----- Method: ExternalTypePool class>>assuredPoolVarNameFor: (in category 'housekeeping') ----- assuredPoolVarNameFor: type | poolVarName | poolVarName := (self poolVarNameFor: type) asSymbol. (self classPool includesKey: poolVarName) + ifFalse: [SystemChangeNotifier uniqueInstance doSilently: [ + self addClassVarName: poolVarName]]. - ifFalse: [self addClassVarName: poolVarName]. self classPool at: poolVarName put: type. ^ poolVarName! Item was added: + ----- Method: ExternalTypePool class>>atomicTypePrefix (in category 'constants') ----- + atomicTypePrefix + + ^ 'AtomicType_'! Item was changed: ----- Method: ExternalTypePool class>>cleanUp (in category 'housekeeping') ----- cleanUp " self cleanUp. " + | prefix | + prefix := self structTypePrefix. self classPool keys do: [:classVarName | + (classVarName beginsWith: prefix) ifTrue: [ - (classVarName beginsWith: 'ExternalType_') ifTrue: [ (self classPool at: classVarName) ifNil: [self classPool removeKey: classVarName]]].! Item was added: + ----- Method: ExternalTypePool class>>nukeAll (in category 'housekeeping') ----- + nukeAll + " + self nukeAll. + " + self classPool keys do: [:classVarName | + self classPool removeKey: classVarName].! Item was changed: ----- Method: ExternalTypePool class>>poolVarNameFor: (in category 'housekeeping') ----- poolVarNameFor: type "Answers the name to be used in the shared pool to speed up type look-up for field access in ExternalStructure." ^ String streamContents: [:stream | | nameStream | + stream nextPutAll: ((type isAtomic and: [type isTypeAlias not]) + ifTrue: [self atomicTypePrefix] + ifFalse: [self structTypePrefix]). - stream nextPutAll: 'ExternalType_'. nameStream := type typeName readStream. [nameStream atEnd] whileFalse: [ | char | (char := nameStream next) caseOf: { [ $( ] -> [ "Ignore." ]. [ $) ] -> [ "Ignore." ]. [ $* ] -> [ stream nextPutAll: '_star' ]. [ $[ ] -> [ stream nextPut: $_ ]. [ $] ] -> [ stream nextPut: $_ ] } otherwise: [ stream nextPut: char ]]]! Item was changed: ----- Method: ExternalTypePool class>>reset (in category 'housekeeping') ----- reset " self reset " + | prefix | + prefix := self structTypePrefix. self classPool keys do: [:classVarName | + (classVarName beginsWith: prefix) ifTrue: [ - (classVarName beginsWith: 'ExternalType_') ifTrue: [ (self classPool at: classVarName put: nil)]].! Item was added: + ----- Method: ExternalTypePool class>>structTypePrefix (in category 'constants') ----- + structTypePrefix + + ^ 'ExternalType_'! Item was added: + ----- Method: ExternalTypePool class>>update (in category 'housekeeping') ----- + update + " + self update + " + self reset. + ExternalType atomicTypesDo: [:type | type generateTypeAccessor]. + ExternalStructure defineAllFields. "Relies on #noteModificationOf: to call #generateTypeAccessor on non-atomic types." + self cleanUp.!

1 0

FFI: FFI-Kernel-mt.214.mcz
by commits＠source.squeak.org 19 Aug '21

19 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.214.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.214 Author: mt Time: 19 August 2021, 10:20:38.176627 am UUID: 4bcee412-2de2-e54e-af6d-a252133d599d Ancestors: FFI-Kernel-mt.213 Fixes start-up regression when moving 64-bit images between platforms. This is essentially a no-op now because we only have byte-alignment issues between 32-bit platforms. See ExternalAtomicType class >> #atomicTypeSpecs. Simplify #reset* methods on ExternalType class. Also update its commentary. A RESET should only be done as a last resort when the image state is corrupt. For all normal cases, use #initialize. And you must not use FFI during the reset. Removes obsolete #becomeStructureType method. ExternalUnknownType has all it needs. =============== Diff against FFI-Kernel-mt.213 =============== Item was added: + ----- Method: ExternalAtomicType class>>atomicTypeSpecs (in category 'class initialization') ----- + atomicTypeSpecs + + | platform isNonArm32BitUnix | + platform := FFIPlatformDescription current. + isNonArm32BitUnix := platform wordSize = 4 and: [platform isUnix and: [platform isARM not]]. + ^ { + "name byte size byte alignment" + #'void' . 0 . 0 . "No non-pointer support in calls. Duh. ;-)" + #'bool' . 1 . 1 . "No pointer support in calls." + + #'uint8_t' . 1 . 1 . + #'int8_t' . 1 . 1 . + #'uint16_t' . 2 . 2 . + #'int16_t' . 2 . 2 . + #'uint32_t' . 4 . 4 . + #'int32_t' . 4 . 4 . + #'uint64_t' . 8 . isNonArm32BitUnix ifTrue: [4] ifFalse: [8] . + #'int64_t' . 8 . isNonArm32BitUnix ifTrue: [4] ifFalse: [8] . + + #'uchar8_t' . 1 . 1 . + #'char8_t' . 1 . 1 . + #'uchar16_t'. 2 . 2 . + #'char16_t' . 2 . 2 . + #'uchar32_t'. 4 . 4 . + #'char32_t' . 4 . 4 . + + #'float' . 4 . 4 . + #'double' . 8 . isNonArm32BitUnix ifTrue: [4] ifFalse: [8] . + }! Item was changed: ----- Method: ExternalAtomicType class>>initializeAtomicTypes (in category 'class initialization') ----- initializeAtomicTypes "Fill all known instances of the receiver with the correct state. See super implementation to learn about the entire initialization process." - | atomicType byteSize type typeName byteAlignment | self assert: [AtomicTypes notNil]. self assert: [AtomicTypes notEmpty]. + self atomicTypeSpecs groupsDo: [:typeName :byteSize :byteAlignment | + | type typeCode compiled | + - #( - "name byte size byte alignment" - (#'void' 0 0) "No non-pointer support in calls. Duh. ;-)" - (#'bool' 1 1) "No pointer support in calls." - - (#'uint8_t' 1 1) - (#'int8_t' 1 1) - (#'uint16_t' 2 2) - (#'int16_t' 2 2) - (#'uint32_t' 4 4) - (#'int32_t' 4 4) - (#'uint64_t' 8 8) - (#'int64_t' 8 8) - - (#'uchar8_t' 1 1) - (#'char8_t' 1 1) - (#'uchar16_t' 2 2) - (#'char16_t' 2 2) - (#'uchar32_t' 4 4) - (#'char32_t' 4 4) - - (#'float' 4 4) - (#'double' 8 8) - "TODO: ('longdouble' 10 16? 4?)" - ) do:[:typeSpec| | compiled | - typeName := typeSpec first. - byteSize := typeSpec second. - byteAlignment := typeSpec third. - - "0) On 32-bits Windows and MacOS, double and long long have an alignment of 8. But on 32-bit Linux, their alignment is 4. But not on a 32-bit Raspberry Pi OS." - (FFIPlatformDescription current wordSize = 4 - and: [FFIPlatformDescription current isUnix - and: [FFIPlatformDescription current isARM not]]) ifTrue: [ - (#('double' 'int64_t' 'uint64_t') includes: typeName) ifTrue: [ - byteAlignment := 4]]. - "1) Regular type; put type code into headerWord" type := AtomicTypes at: typeName. + typeCode := AtomicTypeCodes at: typeName. - atomicType := AtomicTypeCodes at: typeName. compiled := WordArray with: ((byteSize bitOr: FFIFlagAtomic) bitOr: + (typeCode bitShift: FFIAtomicTypeShift)). - (atomicType bitShift: FFIAtomicTypeShift)). compiled ~= type compiledSpec "Preserve the identity of #compiledSpec." ifTrue: [type compiledSpec: compiled]. type byteAlignment: byteAlignment. "2) Pointer type; put type code into headerWord, too" type := type asPointerType. compiled := WordArray with: ((self pointerSpec bitOr: FFIFlagAtomic) bitOr: + (typeCode bitShift: FFIAtomicTypeShift)). - (atomicType bitShift: FFIAtomicTypeShift)). compiled ~= type compiledSpec "Preserve the identity of #compiledSpec." ifTrue: [type compiledSpec: compiled]. + type byteAlignment: self pointerAlignment]. + + self noticeModificationOfAtomics.! - type byteAlignment: self pointerAlignment. - ].! Item was changed: ----- Method: ExternalStructure class>>defineAllChangedFields (in category 'system startup') ----- defineAllChangedFields " ExternalStructure defineAllChangedFields " self allStructuresInCompilationOrder do: [:structClass | structClass defineChangedFields. structClass organization removeEmptyCategories]. + + "No #cleanupUnusedTypes because this method must be fast. See ExternalType class >> #initializeFast."! - - "Compilation of fields only needs external types temporarily. Non-weak references to external types are only in methods with FFI calls." - ExternalType cleanupUnusedTypes.! Item was removed: - ----- Method: ExternalType class>>initializeArrayTypes (in category 'class initialization') ----- - initializeArrayTypes - "Private. Initialize all array types that have an atomic-or-pointer type as their content type. Other array types will be updated through #initializeStructureTypes because of how #defineAllFields work with its callback to ExternalType class >> #noticeModificationOf:." - - self allArrayTypesDo: [:arrayType | - (arrayType contentType isAtomic or: [arrayType contentType isPointerType]) ifTrue: [ - arrayType newContentType: arrayType contentType]].! Item was changed: ----- Method: ExternalType class>>initializeFast (in category 'class initialization') ----- initializeFast "Faster than #initialize. Update all atomic types for platform-specifc byte size and alignment. Also update struct and array types when they change due to changed atomics. NOTE THAT this cannot be used when atomic-type codes have changed!!" ExternalAtomicType initializeAtomicTypes. - self initializeArrayTypes. ExternalStructure defineAllChangedFields.! Item was changed: ----- Method: ExternalType class>>initializeStructureTypes (in category 'class initialization') ----- initializeStructureTypes "(Re-)initialize all structure types and all array types. Preserves object identity of all involved types. If the amount of types changed, use #resetAllStructureTypes instead." self basicInitializeStructureTypes. self invalidateStructureTypes. + + "Trigger #noticeModificationOf: callback to actually initialize all structure types. Since we invalidated all types, we cannot use #defineAllChangedFields. We rely on the #noticeModificationOf: callback." + ExternalStructure defineAllFields.! - - "1) Initialize all array types that have an atomic-or-pointer type as their content type." - self initializeArrayTypes. - - "2) Trigger #noticeModificationOf: callback to actually initialize all structure types. Since we invalidated all types, we cannot use #defineAllChangedFields. We rely on the #noticeModificationOf: callback." - ExternalStructure defineAllFields. - - "Finally do some garbage collection." - self cleanupUnusedTypes.! Item was changed: ----- Method: ExternalType class>>invalidateStructureTypes (in category 'class initialization') ----- invalidateStructureTypes + "Invalidate all types that will be updated through the #noticeModificationOf: callback when #defineFields or #defineAllFields is called." + self allAtomicTypesDo: [:atomicType | + atomicType referentClass ifNotNil: [ "i.e., alias-to-atomic" + atomicType "asNonPointerType" invalidate. + atomicType asPointerType invalidate]]. + + self allArrayTypesDo: [:arrayType | + arrayType contentType referentClass ifNotNil: [ "i.e., not a genuine array-of-atomics" + arrayType "asNonPointerType" invalidate. + arrayType asPointerType invalidate]]. - self typeAliasTypesDo: [:type | type isAtomic ifTrue: [ - type "asNonPointerType" invalidate. - type asPointerType invalidate]]. self allStructTypesDo:[:structType | structType "asNonPointerType" invalidate. + structType asPointerType invalidate].! - structType asPointerType invalidate]. - - self allArrayTypesDo: [:arrayType | - arrayType "asNonPointerType" invalidate. - arrayType asPointerType invalidate].! Item was added: + ----- Method: ExternalType class>>noticeModificationOfAtomics (in category 'housekeeping') ----- + noticeModificationOfAtomics + "Atomic types have been redefined. Initialize all array types that have an atomic-or-pointer type as their content type. Other array types will be updated through #initializeStructureTypes because of how #defineAllFields work with its callback to ExternalType class >> #noticeModificationOf:." + + ArrayTypes ifNil: [^ self "Not yet initialized"]. + self arrayTypesDo: [:arrayType | + (arrayType contentType isAtomic or: [arrayType contentType isPointerType]) ifTrue: [ + arrayType newContentType: arrayType contentType]].! Item was changed: ----- Method: ExternalType class>>platformChangedFrom:to: (in category 'system startup') ----- platformChangedFrom: lastPlatform to: currentPlatform "Byte size or byte alignment for atomic types might be different on the new platform." + lastPlatform pluginVersion ~= currentPlatform pluginVersion + ifTrue: ["Type codes might have changed. Re-init thoroughly. Preserve type identity." + self initialize "Slower but necessary for new type codes"] + ifFalse: ["Byte alignment of double and int64_t might have changed. Re-init quickly. Preserve type identity." + currentPlatform wordSize = 4 ifTrue: [self initializeFast]]. - lastPlatform pluginVersion = currentPlatform pluginVersion - ifTrue: [self initializeFast] - ifFalse: [self initialize "Slower but necessary for new type codes"]. self flag: #todo. "mt: Update all critical aliases for atomic types, i.e., intptr_t, uintptr_t. But what about 'c_long' between 64-bit platforms?!!" "lastPlatform wordSize ~= currentPlatform wordSize ifTrue: [self recompileAllLibraryFunctions]."! Item was removed: - ----- Method: ExternalType class>>resetAllArrayClasses (in category 'housekeeping') ----- - resetAllArrayClasses - - ArrayClasses := nil. - self initializeArrayClasses.! Item was removed: - ----- Method: ExternalType class>>resetAllAtomicTypes (in category 'housekeeping') ----- - resetAllAtomicTypes - "Warning: This call is only required if you change the initialization for AtomicTypes." - - AtomicTypeCodes := nil. - self initializeAtomicTypeCodes. - - AtomicTypes := nil. - self initializeAtomicTypes. - - "Now also reset everything that depends on atomic types." - self resetAllStructureTypes.! Item was removed: - ----- Method: ExternalType class>>resetAllStructureTypes (in category 'housekeeping') ----- - resetAllStructureTypes - "Warning: This call is only required if you change the container for StructTypes!! Note that (2) and (3) can be swapped but that puts unnecessary pressure on the GC." - - StructTypes := nil. - ArrayTypes := nil. - - "1) Initialize the container for structure types." - self initializeStructureTypes. - - "2) Trigger #noticeModificationOf: callback to actually initialize all structure types." - ExternalTypePool reset. - ExternalStructure defineAllFields. "Even if unchanged, we need to fill the type pool." - ExternalTypePool cleanUp. - - "3) Recompile all FFI calls to create and persist structure types." - self recompileAllLibraryFunctions. - - "4) Just in case, we also lookup available array classes. Maybe we have one for a specific struct type, right? :-)" - self resetAllArrayClasses. - ! Item was changed: ----- Method: ExternalType class>>resetAllTypes (in category 'housekeeping') ----- resetAllTypes + "DANGEROUS!! Only do this if you think that your image is in an inconsistent state. You must not actively use FFI (i.e., have instances of external structures or external data) while calling this." - "If we reset the atomic types, we reset everything else." + ExternalTypePool nukeAll. + + AtomicTypeCodes := nil. + AtomicTypes := nil. + StructTypes := nil. + ArrayTypes := nil. + ArrayClasses := nil. + + self initialize. + self recompileAllLibraryFunctions.! - self resetAllAtomicTypes.! Item was removed: - ----- Method: ExternalType>>becomeStructureType (in category 'private - type alias') ----- - becomeStructureType - - self class = ExternalStructure ifTrue: [^ self]. - - self class = ExternalPointerType ifTrue: [ - | newPointerType | - "We are not a type alias for a pointer type anymore." - self changeClassTo: ExternalStructureType. - - "Fetch my updated spec as a structure type." - compiledSpec := referentClass compiledSpec. - byteAlignment := referentClass byteAlignment. - - "Prepare and set my new, dedicated pointer type." - (newPointerType := ExternalPointerType basicNew) - compiledSpec: (WordArray with: self class pointerSpec); - byteAlignment: self class pointerAlignment; - setReferentClass: referentClass; - setReferencedType: self. - referencedType := newPointerType. - - "Done. Answer self because of #changeClassTo:." - ^ self]. - - self class = ExternalArrayType ifTrue: [ - "An not #isTypeAliasForArray anymore. :-( " - | newStructType | - newStructType := ExternalStructureType basicNew - compiledSpec: self compiledSpec; - byteAlignment: self byteAlignment; - setReferentClass: referentClass; - setReferencedType: referencedType; - yourself. - - "Not a pointer type for array type anymore." - referencedType setReferentClass: referentClass. - - self becomeForward: newStructType. - self assert: [newStructType class = ExternalStructureType]. - ^ newStructType].!

1 0

FFI: FFI-Kernel-mt.213.mcz
by commits＠source.squeak.org 18 Aug '21

18 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.213.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.213 Author: mt Time: 18 August 2021, 1:47:59.253508 pm UUID: a7cff8ad-0b48-bf48-bb33-b36a59c09652 Ancestors: FFI-Kernel-mt.212 Use faster update path in postscript. =============== Diff against FFI-Kernel-mt.212 =============== Item was changed: + (PackageInfo named: 'FFI-Kernel') postscript: '"Update for new 16-bit and 32-bit character types. Do not use #resetAllTypes to keep existing FFI context functional such as allocated executable pages in FFICallback." + ExternalType initialize.'! - (PackageInfo named: 'FFI-Kernel') postscript: '"Reinitialize new names and codes for atomic types. Includes new types for 16-bit and 32-bit characters." - FFIConstants initialize. - ExternalType resetAllTypes..'!

1 0

FFI: FFI-Kernel-mt.212.mcz
by commits＠source.squeak.org 18 Aug '21

18 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.212.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.212 Author: mt Time: 18 August 2021, 12:03:05.687133 pm UUID: 5bf6ded7-5f9b-de41-8c03-aeacd2620940 Ancestors: FFI-Kernel-mt.211 Fixes issue with updating alias-to-atomic types through #noticeModificationOf:. Speeds up image startUp on platform changes. Complements FFI-Tests-mt.62. =============== Diff against FFI-Kernel-mt.211 =============== Item was added: + ----- Method: ExternalAtomicType>>newReferentClass: (in category 'private') ----- + newReferentClass: classOrNil + "If I am an alias-to-atomic type, fetch the current spec from my referentClass." + + (referentClass := classOrNil) + ifNotNil: [ "my class has been changed - update my compiledSpec" + compiledSpec := referentClass compiledSpec. + byteAlignment := referentClass byteAlignment].! Item was removed: - ----- Method: ExternalStructure class>>platformChangedFrom:to: (in category 'system startup') ----- - platformChangedFrom: lastPlatform to: currentPlatform - "The system is coming up on a new platform. Compile all field specs and install them in the respective struct types. Also re-generate all struct-field accessors if necessary." - - self defineAllFields.! Item was removed: - ----- Method: ExternalType class>>checkTypeIntegrity (in category 'housekeeping') ----- - checkTypeIntegrity - " - self initialize. - self checkTypeIntegrity. - " - #(atomicTypesDo: atomic structTypesDo: struct pointerTypesDo: pointer arrayTypesDo: array typeAliasTypesDo: alias) - groupsDo: [:enumerator :label | - Transcript showln: ('Checking integrity of {1} types ...' format: { label }). - self perform: enumerator with: [:type | - type compiledSpec ifNil: [Transcript showln: '...', type typeName, ' has invalid compiledSpec!!']. - type byteAlignment ifNil: [Transcript showln: '...', type typeName, ' has invalid byteAlignment!!']]].! Item was added: + ----- Method: ExternalType class>>initializeArrayTypes (in category 'class initialization') ----- + initializeArrayTypes + "Private. Initialize all array types that have an atomic-or-pointer type as their content type. Other array types will be updated through #initializeStructureTypes because of how #defineAllFields work with its callback to ExternalType class >> #noticeModificationOf:." + + self allArrayTypesDo: [:arrayType | + (arrayType contentType isAtomic or: [arrayType contentType isPointerType]) ifTrue: [ + arrayType newContentType: arrayType contentType]].! Item was changed: ----- Method: ExternalType class>>initializeAtomicTypeCodes (in category 'class initialization') ----- initializeAtomicTypeCodes "ExternalType initializeAtomicTypeCodes" + FFIConstants initialize. "Init appropriate type codes for current plugin version." + AtomicTypeCodes := OrderedDictionary newFrom: { #'void' -> FFITypeVoid. #'bool' -> FFITypeBool. #'uint8_t' -> FFITypeUnsignedInt8. #'int8_t' -> FFITypeSignedInt8. #'uint16_t' -> FFITypeUnsignedInt16. #'int16_t' -> FFITypeSignedInt16. #'uint32_t' -> FFITypeUnsignedInt32. #'int32_t' -> FFITypeSignedInt32. #'uint64_t' -> FFITypeUnsignedInt64. #'int64_t' -> FFITypeSignedInt64. #'uchar8_t' -> FFITypeUnsignedChar8. #'char8_t' -> FFITypeSignedChar8. #'uchar16_t' -> FFITypeUnsignedChar16. #'char16_t' -> FFITypeSignedChar16. #'uchar32_t' -> FFITypeUnsignedChar32. #'char32_t' -> FFITypeSignedChar32. #'float' -> FFITypeSingleFloat. #'double' -> FFITypeDoubleFloat}. "We must now update the names of all known atomic types." AtomicTypes ifNotNil: [ AtomicTypes keys do: [:oldName | | type newName | type := AtomicTypes at: oldName. newName := AtomicTypeCodes keyAtValue: type atomicType. (AtomicTypes includesKey: newName) ifFalse: [ "Only store new names. Do not support name swap." AtomicTypes removeKey: oldName. AtomicTypes at: newName put: type. type setAtomicTypeName: newName]]].! Item was changed: ----- Method: ExternalType class>>initializeAtomicTypes (in category 'class initialization') ----- initializeAtomicTypes + "Private. (Re-)initialize all atomic types. Preserves object identity of all involved types. If the amount of types changed, use #resetAllAtomicTypes instead. Needs atomic-type codes to be initialized already." - "(Re-)initialize all atomic types. Preserves object identity of all involved types. If the amount of types changed, use #resetAllAtomicTypes instead. Needs atomic-type codes to be initialized already." self assert: [AtomicTypeCodes notNil]. self assert: [AtomicTypeCodes notEmpty]. self basicInitializeAtomicTypes. self invalidateAtomicTypes. ExternalAtomicType initializeAtomicTypes. ExternalAtomicType initializeAtomicTypeCompanions. self initializeAtomicSends.! Item was added: + ----- Method: ExternalType class>>initializeFast (in category 'class initialization') ----- + initializeFast + "Faster than #initialize. Update all atomic types for platform-specifc byte size and alignment. Also update struct and array types when they change due to changed atomics. NOTE THAT this cannot be used when atomic-type codes have changed!!" + + ExternalAtomicType initializeAtomicTypes. + self initializeArrayTypes. + ExternalStructure defineAllChangedFields.! Item was changed: ----- Method: ExternalType class>>initializeStructureTypes (in category 'class initialization') ----- initializeStructureTypes "(Re-)initialize all structure types and all array types. Preserves object identity of all involved types. If the amount of types changed, use #resetAllStructureTypes instead." self basicInitializeStructureTypes. self invalidateStructureTypes. "1) Initialize all array types that have an atomic-or-pointer type as their content type." + self initializeArrayTypes. - self allArrayTypesDo: [:arrayType | - (arrayType contentType isAtomic or: [arrayType contentType isPointerType]) ifTrue: [ - arrayType newContentType: arrayType contentType]]. + "2) Trigger #noticeModificationOf: callback to actually initialize all structure types. Since we invalidated all types, we cannot use #defineAllChangedFields. We rely on the #noticeModificationOf: callback." - "2) Trigger #noticeModificationOf: callback to actually initialize all structure types." ExternalStructure defineAllFields. "Finally do some garbage collection." self cleanupUnusedTypes.! Item was changed: ----- Method: ExternalType class>>invalidateAtomicTypes (in category 'class initialization') ----- invalidateAtomicTypes + "Invalidate all pure atomic types. Do not invalidate alias-to-atomic types here. See #invalidateStructureTypes." self atomicTypesDo: [:atomicType | atomicType "asNonPointerType" invalidate. atomicType asPointerType invalidate].! Item was changed: ----- Method: ExternalType class>>invalidateStructureTypes (in category 'class initialization') ----- invalidateStructureTypes + self typeAliasTypesDo: [:type | type isAtomic ifTrue: [ + type "asNonPointerType" invalidate. + type asPointerType invalidate]]. + self allStructTypesDo:[:structType | structType "asNonPointerType" invalidate. structType asPointerType invalidate]. self allArrayTypesDo: [:arrayType | arrayType "asNonPointerType" invalidate. arrayType asPointerType invalidate].! Item was changed: ----- Method: ExternalType class>>platformChangedFrom:to: (in category 'system startup') ----- platformChangedFrom: lastPlatform to: currentPlatform "Byte size or byte alignment for atomic types might be different on the new platform." + lastPlatform pluginVersion = currentPlatform pluginVersion + ifTrue: [self initializeFast] + ifFalse: [self initialize "Slower but necessary for new type codes"]. - "0) For a different FFI plugin version, type-codes might have changed." - lastPlatform pluginVersion ~= currentPlatform pluginVersion ifTrue: [ - FFIConstants initialize. - self initializeAtomicTypeCodes]. - - "1) Update all atomic types for platform-specifc byte size and alignment." - self initializeAtomicTypes. + self flag: #todo. "mt: Update all critical aliases for atomic types, i.e., intptr_t, uintptr_t. But what about 'c_long' between 64-bit platforms?!!" + "lastPlatform wordSize ~= currentPlatform wordSize + ifTrue: [self recompileAllLibraryFunctions]."! - "2) Discard all compiled specs for all structure types." - self initializeStructureTypes. - - "3) Update all critical aliases for atomic types, i.e., intptr_t, uintptr_t. But what about 'c_long' between 64-bit platforms?!!" - lastPlatform wordSize ~= currentPlatform wordSize - ifTrue: [self recompileAllLibraryFunctions].! 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 ] - ExternalAddress allBeNull. - ExternalType cleanupUnusedTypes ] ifFalse: [ LastPlatform := currentPlatform. "Update now. See #current." + { ExternalAddress. ExternalType. ExternalPool. ExternalLibrary } - { ExternalAddress. ExternalType. ExternalStructure. ExternalPool. ExternalLibrary } do: [:cls | cls platformChangedFrom: lastPlatform to: currentPlatform] ]]]. self checkFFIOnStartUp ifTrue: [self checkFFI]].!

1 0

FFI: FFI-Tests-mt.62.mcz
by commits＠source.squeak.org 18 Aug '21

18 Aug '21

Marcel Taeumel uploaded a new version of FFI-Tests to project FFI: http://source.squeak.org/FFI/FFI-Tests-mt.62.mcz ==================== Summary ==================== Name: FFI-Tests-mt.62 Author: mt Time: 18 August 2021, 11:56:50.753133 am UUID: 3ed16468-cd62-8146-afe1-0403171c62b6 Ancestors: FFI-Tests-mt.61 Move image tests to new test case. Add manual checks for type integrity. =============== Diff against FFI-Tests-mt.61 =============== Item was removed: - ----- Method: ExternalTypeTests>>testAllArrayTypes (in category 'tests - image') ----- - testAllArrayTypes - - ExternalType allArrayTypes do: [:type | - self - deny: type isAtomic; - deny: type isPointerType; - deny: type isStructureType; - assert: type isArrayType].! Item was removed: - ----- Method: ExternalTypeTests>>testAllAtomicTypes (in category 'tests - image') ----- - testAllAtomicTypes - - ExternalType allAtomicTypes do: [:type | - self - assert: type isAtomic; - deny: type isPointerType; - deny: type isStructureType; - deny: type isArrayType].! Item was removed: - ----- Method: ExternalTypeTests>>testAllPointerTypes (in category 'tests - image') ----- - testAllPointerTypes - - ExternalType allPointerTypes do: [:type | - self - deny: type isAtomic; - assert: type isPointerType; - deny: type isStructureType; - deny: type isArrayType].! Item was removed: - ----- Method: ExternalTypeTests>>testAllStructureTypes (in category 'tests - image') ----- - testAllStructureTypes - - ExternalType allStructTypes do: [:type | - self - deny: type isAtomic; - deny: type isPointerType; - assert: type isStructureType; - deny: type isArrayType].! Item was added: + TestCase subclass: #FFIImageTests + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'FFI-Tests'! Item was added: + ----- Method: FFIImageTests class>>checkPlatformChange (in category 'manual checks') ----- + checkPlatformChange + " + self checkPlatformChange. + " + | old new bench | + old := FFIPlatformDescription newCurrent name: 'TEST'. + new := FFIPlatformDescription newCurrent. + + self assert: [old ~= new]. + bench := [ExternalType platformChangedFrom: old to: new] bench. + Transcript showln: bench. + self debug: #test05TypeIntegrity. + ! Item was added: + ----- Method: FFIImageTests class>>checkTypeIntegrity (in category 'manual checks') ----- + checkTypeIntegrity + " + self checkTypeIntegrity. + " + ExternalType initializeFast. + self debug: #test05TypeIntegrity. + + ExternalType initialize. + self debug: #test05TypeIntegrity. + + ExternalType resetAllTypes. + self debug: #test05TypeIntegrity.! Item was added: + ----- Method: FFIImageTests>>test01AllAtomicTypes (in category 'tests') ----- + test01AllAtomicTypes + + ExternalType allAtomicTypes do: [:type | + self + assert: type isAtomic; + deny: type isPointerType; + deny: type isStructureType; + deny: type isArrayType].! Item was added: + ----- Method: FFIImageTests>>test02AllStructureTypes (in category 'tests') ----- + test02AllStructureTypes + + ExternalType allStructTypes do: [:type | + self + deny: type isAtomic; + deny: type isPointerType; + assert: type isStructureType; + deny: type isArrayType].! Item was added: + ----- Method: FFIImageTests>>test03AllPointerTypes (in category 'tests') ----- + test03AllPointerTypes + + ExternalType allPointerTypes do: [:type | + self + deny: type isAtomic; + assert: type isPointerType; + deny: type isStructureType; + deny: type isArrayType].! Item was added: + ----- Method: FFIImageTests>>test04AllArrayTypes (in category 'tests') ----- + test04AllArrayTypes + + ExternalType allArrayTypes do: [:type | + self + deny: type isAtomic; + deny: type isPointerType; + deny: type isStructureType; + assert: type isArrayType].! Item was added: + ----- Method: FFIImageTests>>test05TypeIntegrity (in category 'tests') ----- + test05TypeIntegrity + + "ExternalType initialize." + + #(atomicTypesDo: structTypesDo: pointerTypesDo: arrayTypesDo: typeAliasTypesDo:) + do: [:enumerator | + ExternalType perform: enumerator with: [:type | + self assert: type compiledSpec notNil. + self assert: type byteAlignment notNil. + self assert: type asPointerType notNil. + self assert: type asNonPointerType notNil.]].!

1 0

FFI: FFI-Kernel-mt.211.mcz
by commits＠source.squeak.org 18 Aug '21

18 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.211.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.211 Author: mt Time: 18 August 2021, 10:23:48.749508 am UUID: ddaad2aa-6b86-a344-8a2f-0f06f5ab6489 Ancestors: FFI-Kernel-mt.210 Fixes another migration issue. Keep #atomicTypeName as quick-return; migrate older instances in #basicInitializeAtomicTypes instead. =============== Diff against FFI-Kernel-mt.210 =============== Item was changed: ----- Method: ExternalType class>>basicInitializeAtomicTypes (in category 'class initialization') ----- basicInitializeAtomicTypes "Strong references required because there is no lazy initialization like there is for struct types and array types." AtomicTypes ifNil: [AtomicTypes := Dictionary new]. "Add new atomic types using the current configuration of AtomicTypeCodes." AtomicTypeCodes keysDo: [:typeName | (AtomicTypes includesKey: typeName) ifFalse: [ self newTypeForAtomicNamed: typeName]]. "Remove discarded types." AtomicTypes keys do: [:typeName | (AtomicTypeCodes includesKey: typeName) ifFalse: [ + AtomicTypes removeKey: typeName]]. + + "Migrate older instances." + AtomicTypes keysAndValuesDo: [:typeName :type | + type setAtomicTypeName: typeName]! - AtomicTypes removeKey: typeName]].!

1 0

FFI: FFI-Kernel-mt.210.mcz
by commits＠source.squeak.org 18 Aug '21

18 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.210.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.210 Author: mt Time: 18 August 2021, 10:08:19.325508 am UUID: 694f587f-daa5-8e40-9b51-b8b7037f72e5 Ancestors: FFI-Kernel-mt.209 Fixes a regresion with type invalidation, which is an issue when updating existing FFI setup. More robust re-initialization of existing atomic types. Now supports renaming and add/remove using the AtomicTypeCodes table. =============== Diff against FFI-Kernel-mt.209 =============== Item was changed: ----- Method: ExternalType class>>basicInitializeAtomicTypes (in category 'class initialization') ----- basicInitializeAtomicTypes + "Strong references required because there is no lazy initialization like there is for struct types and array types." + AtomicTypes ifNil: [AtomicTypes := Dictionary new]. + + "Add new atomic types using the current configuration of AtomicTypeCodes." + AtomicTypeCodes keysDo: [:typeName | + (AtomicTypes includesKey: typeName) ifFalse: [ + self newTypeForAtomicNamed: typeName]]. + + "Remove discarded types." + AtomicTypes keys do: [:typeName | + (AtomicTypeCodes includesKey: typeName) ifFalse: [ + AtomicTypes removeKey: typeName]].! - AtomicTypes ifNil: [ - AtomicTypes := Dictionary new. "Strong references required because there is no lazy atomic type initialization like there is for struct types and array types." - self atomicTypeNames do: [:typeName | - self newTypeForAtomicNamed: typeName]].! Item was changed: ----- Method: ExternalType class>>initializeAtomicTypeCodes (in category 'class initialization') ----- initializeAtomicTypeCodes "ExternalType initializeAtomicTypeCodes" AtomicTypeCodes := OrderedDictionary newFrom: { #'void' -> FFITypeVoid. #'bool' -> FFITypeBool. #'uint8_t' -> FFITypeUnsignedInt8. #'int8_t' -> FFITypeSignedInt8. #'uint16_t' -> FFITypeUnsignedInt16. #'int16_t' -> FFITypeSignedInt16. #'uint32_t' -> FFITypeUnsignedInt32. #'int32_t' -> FFITypeSignedInt32. #'uint64_t' -> FFITypeUnsignedInt64. #'int64_t' -> FFITypeSignedInt64. #'uchar8_t' -> FFITypeUnsignedChar8. #'char8_t' -> FFITypeSignedChar8. #'uchar16_t' -> FFITypeUnsignedChar16. #'char16_t' -> FFITypeSignedChar16. #'uchar32_t' -> FFITypeUnsignedChar32. #'char32_t' -> FFITypeSignedChar32. #'float' -> FFITypeSingleFloat. #'double' -> FFITypeDoubleFloat}. + "We must now update the names of all known atomic types." + AtomicTypes ifNotNil: [ + AtomicTypes keys do: [:oldName | + | type newName | + type := AtomicTypes at: oldName. + newName := AtomicTypeCodes keyAtValue: type atomicType. + (AtomicTypes includesKey: newName) ifFalse: [ + "Only store new names. Do not support name swap." + AtomicTypes removeKey: oldName. + AtomicTypes at: newName put: type. + type setAtomicTypeName: newName]]].! - "We must now reset all atomic types because their names might have changed." - AtomicTypes := nil.! Item was changed: ----- Method: ExternalType class>>initializeStructureTypes (in category 'class initialization') ----- initializeStructureTypes "(Re-)initialize all structure types and all array types. Preserves object identity of all involved types. If the amount of types changed, use #resetAllStructureTypes instead." self basicInitializeStructureTypes. self invalidateStructureTypes. "1) Initialize all array types that have an atomic-or-pointer type as their content type." + self allArrayTypesDo: [:arrayType | - self arrayTypesDo: [:arrayType | (arrayType contentType isAtomic or: [arrayType contentType isPointerType]) ifTrue: [ arrayType newContentType: arrayType contentType]]. "2) Trigger #noticeModificationOf: callback to actually initialize all structure types." ExternalStructure defineAllFields. "Finally do some garbage collection." self cleanupUnusedTypes.! Item was changed: ----- Method: ExternalType class>>invalidateStructureTypes (in category 'class initialization') ----- invalidateStructureTypes + self allStructTypesDo:[:structType | - self structTypesDo:[:structType | structType "asNonPointerType" invalidate. structType asPointerType invalidate]. + self allArrayTypesDo: [:arrayType | - self arrayTypesDo: [:arrayType | arrayType "asNonPointerType" invalidate. arrayType asPointerType invalidate].!

1 0

FFI: FFI-Pools-mt.35.mcz
by commits＠source.squeak.org 18 Aug '21

18 Aug '21

Marcel Taeumel uploaded a new version of FFI-Pools to project FFI: http://source.squeak.org/FFI/FFI-Pools-mt.35.mcz ==================== Summary ==================== Name: FFI-Pools-mt.35 Author: mt Time: 18 August 2021, 9:11:12.928508 am UUID: 1b731622-da56-494b-830c-74b78669ab4f Ancestors: FFI-Pools-mt.34 Make sure to initialize the renamed type-code constants correctly when updating from a prior FFI version. =============== Diff against FFI-Pools-mt.34 =============== Item was changed: + (PackageInfo named: 'FFI-Pools') postscript: 'Smalltalk removeFromStartUpList: ExternalPool. + FFIConstants initializeTypeConstants. "Renamed."'! - (PackageInfo named: 'FFI-Pools') postscript: 'Smalltalk removeFromStartUpList: ExternalPool.'!

1 0

FFI: FFI-Kernel-mt.209.mcz
by commits＠source.squeak.org 18 Aug '21

18 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.209.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.209 Author: mt Time: 18 August 2021, 8:53:45.010508 am UUID: d7ef9c5c-b86d-4f49-8e54-9d94b0a47564 Ancestors: FFI-Kernel-mt.208 Fixes recent regression about updating FFI from before FFI-Kernel-mt.208. =============== Diff against FFI-Kernel-mt.208 =============== Item was changed: ----- Method: ExternalType class>>initializeAtomicTypeCodes (in category 'class initialization') ----- initializeAtomicTypeCodes "ExternalType initializeAtomicTypeCodes" AtomicTypeCodes := OrderedDictionary newFrom: { #'void' -> FFITypeVoid. #'bool' -> FFITypeBool. #'uint8_t' -> FFITypeUnsignedInt8. #'int8_t' -> FFITypeSignedInt8. #'uint16_t' -> FFITypeUnsignedInt16. #'int16_t' -> FFITypeSignedInt16. #'uint32_t' -> FFITypeUnsignedInt32. #'int32_t' -> FFITypeSignedInt32. #'uint64_t' -> FFITypeUnsignedInt64. #'int64_t' -> FFITypeSignedInt64. #'uchar8_t' -> FFITypeUnsignedChar8. #'char8_t' -> FFITypeSignedChar8. #'uchar16_t' -> FFITypeUnsignedChar16. #'char16_t' -> FFITypeSignedChar16. #'uchar32_t' -> FFITypeUnsignedChar32. #'char32_t' -> FFITypeSignedChar32. #'float' -> FFITypeSingleFloat. + #'double' -> FFITypeDoubleFloat}. + + "We must now reset all atomic types because their names might have changed." + AtomicTypes := nil.! - #'double' -> FFITypeDoubleFloat - }.!

1 0

FFI: FFI-Tests-mt.61.mcz
by commits＠source.squeak.org 17 Aug '21

17 Aug '21

Marcel Taeumel uploaded a new version of FFI-Tests to project FFI: http://source.squeak.org/FFI/FFI-Tests-mt.61.mcz ==================== Summary ==================== Name: FFI-Tests-mt.61 Author: mt Time: 17 August 2021, 12:30:22.330505 pm UUID: d92ebf12-e21a-1646-b151-10aa59cfc878 Ancestors: FFI-Tests-mt.60 Complements FFI-Kernel-mt.208 =============== Diff against FFI-Tests-mt.60 =============== Item was changed: ----- Method: ExternalTypeTests>>testAllArrayTypes (in category 'tests - image') ----- testAllArrayTypes + ExternalType allArrayTypes do: [:type | - ExternalType arrayTypes do: [:type | self deny: type isAtomic; deny: type isPointerType; deny: type isStructureType; assert: type isArrayType].! Item was changed: ----- Method: ExternalTypeTests>>testAllAtomicTypes (in category 'tests - image') ----- testAllAtomicTypes + ExternalType allAtomicTypes do: [:type | - ExternalType atomicTypes do: [:type | self assert: type isAtomic; deny: type isPointerType; deny: type isStructureType; + deny: type isArrayType].! - deny: type isArrayType; - deny: type isTypeAlias].! Item was changed: ----- Method: ExternalTypeTests>>testAllPointerTypes (in category 'tests - image') ----- testAllPointerTypes + ExternalType allPointerTypes do: [:type | - ExternalType pointerTypes do: [:type | self deny: type isAtomic; assert: type isPointerType; deny: type isStructureType; deny: type isArrayType].! Item was changed: ----- Method: ExternalTypeTests>>testAllStructureTypes (in category 'tests - image') ----- testAllStructureTypes + ExternalType allStructTypes do: [:type | - ExternalType structTypes do: [:type | self deny: type isAtomic; deny: type isPointerType; assert: type isStructureType; deny: type isArrayType].! Item was changed: ----- Method: ExternalTypeTests>>testAtomicTypeRange (in category 'tests - atomic types') ----- testAtomicTypeRange "Tests the range of non-integer and non-float types. Includes char types because those look different in Smalltalk." self should: [ExternalType void minVal] raise: Error. self should: [ExternalType void maxVal] raise: Error. self should: [ExternalType bool minVal] raise: Error. self should: [ExternalType bool maxVal] raise: Error. + self should: [ExternalType char8_t minVal] raise: Error. + self should: [ExternalType char8_t maxVal] raise: Error. - self should: [ExternalType char "unsignedChar" minVal] raise: Error. - self should: [ExternalType char "unsignedChar" maxVal] raise: Error. + self should: [ExternalType uchar8_t minVal] raise: Error. + self should: [ExternalType uchar8_t maxVal] raise: Error. - self should: [ExternalType signedChar "schar" minVal] raise: Error. - self should: [ExternalType signedChar "schar" maxVal] raise: Error. ! Item was changed: ----- Method: ExternalTypeTests>>testFloatTypes (in category 'tests - atomic float types') ----- testFloatTypes #( float 4 double 8 ) pairsDo: [:typeName :byteSize | | type | type := ExternalType typeNamed: typeName. self assert: type isFloatType; + assert: byteSize equals: type byteSize; + assert: type companionType notNil; + assert: type companionType isFloatType].! - assert: byteSize equals: type byteSize].! Item was changed: ----- Method: ExternalTypeTests>>testIntegerTypes (in category 'tests - atomic integer types') ----- testIntegerTypes #( uint8_t 1 int8_t 1 uint16_t 2 int16_t 2 uint32_t 4 int32_t 4 uint64_t 8 int64_t 8 ) pairsDo: [:typeName :byteSize | | type | type := ExternalType typeNamed: typeName. self assert: type isIntegerType; + assert: byteSize equals: type byteSize; + assert: type companionType notNil; + assert: type companionType isIntegerType].! - assert: byteSize equals: type byteSize].! Item was added: + ----- Method: ExternalTypeTests>>testIntegerTypesAsCharTypes (in category 'tests - atomic integer types') ----- + testIntegerTypesAsCharTypes + + #( int8_t int16_t int32_t ) do: [:typeName | + | integerType | + integerType := ExternalType typeNamed: typeName. + self + assert: integerType isSigned; + assert: integerType asCharType isCharType; + assert: integerType byteSize equals: integerType asCharType byteSize; + assert: integerType isSigned equals: integerType asCharType isSigned; + + assert: integerType asUnsigned isUnsigned; + assert: integerType asUnsigned asCharType isCharType; + assert: integerType asUnsigned byteSize equals: integerType asUnsigned asCharType byteSize; + assert: integerType asUnsigned isUnsigned equals: integerType asUnsigned asCharType isUnsigned].! Item was changed: ----- Method: ExternalTypeTests>>testPointerToPointerVsArrayOfPointers (in category 'tests - pointer types') ----- testPointerToPointerVsArrayOfPointers "For visual clarity, the pointer type of an array-of-pointers type will look different from the pointer type of an array-of-atomics/structs. Also see #testPointerToPointer." | arrayType | + arrayType := ExternalType typeNamed: 'int32_t[]'. - arrayType := ExternalType typeNamed: 'char[]'. self + assert: '(int32_t[])*' - assert: '(char[])*' equals: arrayType asPointerType typeName. + arrayType := ExternalType typeNamed: 'int32_t*[]'. - arrayType := ExternalType typeNamed: 'char*[]'. self + assert: '(int32_t*[])*' - assert: '(char*[])*' equals: arrayType asPointerType typeName.! Item was changed: ----- Method: FFIAllocateTests>>test10ArrayClasses (in category 'tests - array') ----- test10ArrayClasses "For integer and float types, allocate arrays and check for specific array classes. Then construct a conventional byte array for an external data structure. A copy should also convert into a specific array class with the same contents." ExternalType useArrayClassesDuring: [ ExternalType atomicTypes do: [:contentType | (contentType isIntegerType or: [contentType isFloatType] + or: [contentType isCharType and: [contentType byteSize ~= 2 "No array class for 16-bit characters yet"]]) ifTrue: [ - or: [contentType isCharType]) ifTrue: [ | array arrayType data copy | array := self allocate: contentType size: 5. arrayType := array externalType. self assert: array isFFIArray. self assert: 5 equals: array size. self assert: array byteSize equals: arrayType byteSize. + contentType isCharType ifFalse: [ - contentType = ExternalType signedChar ifFalse: [ self flag: #discuss. "mt: What is signedChar even for?" self assert: contentType equals: array contentType]. self deny: array isNull. self deny: (array isKindOf: ExternalData). self assert: array equals: array getHandle. self shouldnt: [array at: 1 put: contentType allocate first] raise: Error. self shouldnt: [array zeroMemory] raise: Error. self should: [array setContentType: ExternalType byte] raise: Error. self should: [array setSize: 42] raise: Error. data := ExternalData fromHandle: (ByteArray new: arrayType byteSize) type: arrayType. copy := data copy. "From external data into raw-bits array." self deny: array equals: data. self assert: array equals: copy. ]]].!

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages August 2021