Packages May 2021

packages@lists.squeakfoundation.org

1 participants
169 discussions

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

21 May '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.165.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.165 Author: mt Time: 21 May 2021, 11:54:01.161285 am UUID: 849d8c16-bd3f-e941-8765-2d5813f9e0eb Ancestors: FFI-Kernel-mt.164 For consistency, make raw-bits arrays compatible with handle-based access. They are both handle and (FFI) array after all. Unlike ExternalData. See #getHandle. Note that the intended use is still through the array protocol: #at:, #at:put:, #from:to:, #from:, ... =============== Diff against FFI-Kernel-mt.164 =============== Item was added: + ----- Method: ByteString>>atByteOffset: (in category '*FFI-Kernel-accessing') ----- + atByteOffset: byteOffset + + | index | + index := ((byteOffset-1) / self contentType byteSize) + 1. + ^ self at: index! Item was added: + ----- Method: ByteString>>atByteOffset:put: (in category '*FFI-Kernel-accessing') ----- + atByteOffset: byteOffset put: value + + | index | + index := ((byteOffset-1) / self contentType byteSize) + 1. + ^ self at: index put: value! Item was changed: + ----- Method: ByteString>>contentType (in category '*FFI-Kernel-external data') ----- - ----- Method: ByteString>>contentType (in category '*FFI-Kernel') ----- contentType ^ self externalType contentType! Item was changed: + ----- Method: ByteString>>externalType (in category '*FFI-Kernel-external data') ----- - ----- Method: ByteString>>externalType (in category '*FFI-Kernel') ----- externalType ^ self class externalType contentType asArrayType: self size! Item was changed: + ----- Method: ByteString>>free (in category '*FFI-Kernel-external data') ----- - ----- Method: ByteString>>free (in category '*FFI-Kernel') ----- free self shouldNotImplement.! Item was changed: + ----- Method: ByteString>>from: (in category '*FFI-Kernel-external data') ----- - ----- Method: ByteString>>from: (in category '*FFI-Kernel') ----- from: firstIndex "See ExternalData" ^ self copyFrom: firstIndex to: self size! Item was changed: + ----- Method: ByteString>>from:to: (in category '*FFI-Kernel-external data') ----- - ----- Method: ByteString>>from:to: (in category '*FFI-Kernel') ----- from: firstIndex to: lastIndex "See ExternalData" ^ self copyFrom: firstIndex to: lastIndex! Item was changed: + ----- Method: ByteString>>getHandle (in category '*FFI-Kernel-external data') ----- - ----- Method: ByteString>>getHandle (in category '*FFI-Kernel') ----- getHandle "I am my own handle." ^ self! Item was added: + ----- Method: ByteString>>integerAt:put:size:signed: (in category '*FFI-Kernel-accessing') ----- + integerAt: byteOffset put: value size: nBytes signed: aBoolean + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:put:." + + ^ self atByteOffset: byteOffset put: value asCharacter.! Item was added: + ----- Method: ByteString>>integerAt:size:signed: (in category '*FFI-Kernel-accessing') ----- + integerAt: byteOffset size: nBytes signed: aBoolean + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset! Item was changed: + ----- Method: ByteString>>isFFIArray (in category '*FFI-Kernel-external data') ----- - ----- Method: ByteString>>isFFIArray (in category '*FFI-Kernel') ----- isFFIArray ^ true! Item was changed: + ----- Method: ByteString>>isNull (in category '*FFI-Kernel-external data') ----- - ----- Method: ByteString>>isNull (in category '*FFI-Kernel') ----- isNull ^ false! Item was changed: + ----- Method: ByteString>>reader (in category '*FFI-Kernel-external data') ----- - ----- Method: ByteString>>reader (in category '*FFI-Kernel') ----- reader ^ self! Item was changed: + ----- Method: ByteString>>setContentType: (in category '*FFI-Kernel-external data') ----- - ----- Method: ByteString>>setContentType: (in category '*FFI-Kernel') ----- setContentType: type "See ExternalData." self shouldNotImplement.! Item was changed: + ----- Method: ByteString>>setSize: (in category '*FFI-Kernel-external data') ----- - ----- Method: ByteString>>setSize: (in category '*FFI-Kernel') ----- setSize: size "See ExternalData." self shouldNotImplement.! Item was changed: + ----- Method: ByteString>>writer (in category '*FFI-Kernel-external data') ----- - ----- Method: ByteString>>writer (in category '*FFI-Kernel') ----- writer ^ self! Item was changed: + ----- Method: ByteString>>zeroMemory (in category '*FFI-Kernel-external data') ----- - ----- Method: ByteString>>zeroMemory (in category '*FFI-Kernel') ----- zeroMemory 1 to: self size do: [:index | self at: index put: Character null].! Item was added: + ----- Method: RawBitsArray>>atByteOffset: (in category '*FFI-Kernel-accessing') ----- + atByteOffset: byteOffset + + | index | + index := ((byteOffset-1) / self contentType byteSize) + 1. + ^ self at: index! Item was added: + ----- Method: RawBitsArray>>atByteOffset:put: (in category '*FFI-Kernel-accessing') ----- + atByteOffset: byteOffset put: value + + | index | + index := ((byteOffset-1) / self contentType byteSize) + 1. + ^ self at: index put: value! Item was changed: + ----- Method: RawBitsArray>>contentType (in category '*FFI-Kernel-external data') ----- - ----- Method: RawBitsArray>>contentType (in category '*FFI-Kernel') ----- contentType ^ self externalType contentType! Item was added: + ----- Method: RawBitsArray>>doubleAt: (in category '*FFI-Kernel-accessing') ----- + doubleAt: byteOffset + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset! Item was added: + ----- Method: RawBitsArray>>doubleAt:put: (in category '*FFI-Kernel-accessing') ----- + doubleAt: byteOffset put: value + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:put:." + + ^ self atByteOffset: byteOffset put: value! Item was changed: + ----- Method: RawBitsArray>>externalType (in category '*FFI-Kernel-external data') ----- - ----- Method: RawBitsArray>>externalType (in category '*FFI-Kernel') ----- externalType ^ self class externalType contentType asArrayType: self size! Item was added: + ----- Method: RawBitsArray>>floatAt: (in category '*FFI-Kernel-accessing') ----- + floatAt: byteOffset + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset! Item was added: + ----- Method: RawBitsArray>>floatAt:put: (in category '*FFI-Kernel-accessing') ----- + floatAt: byteOffset put: value + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:put:." + + ^ self atByteOffset: byteOffset put: value! Item was changed: + ----- Method: RawBitsArray>>free (in category '*FFI-Kernel-external data') ----- - ----- Method: RawBitsArray>>free (in category '*FFI-Kernel') ----- free self shouldNotImplement.! Item was changed: + ----- Method: RawBitsArray>>from: (in category '*FFI-Kernel-external data') ----- - ----- Method: RawBitsArray>>from: (in category '*FFI-Kernel') ----- from: firstIndex "See ExternalData" ^ self copyFrom: firstIndex to: self size! Item was changed: + ----- Method: RawBitsArray>>from:to: (in category '*FFI-Kernel-external data') ----- - ----- Method: RawBitsArray>>from:to: (in category '*FFI-Kernel') ----- from: firstIndex to: lastIndex "See ExternalData" ^ self copyFrom: firstIndex to: lastIndex! Item was changed: + ----- Method: RawBitsArray>>getHandle (in category '*FFI-Kernel-external data') ----- - ----- Method: RawBitsArray>>getHandle (in category '*FFI-Kernel') ----- getHandle "I am my own handle." ^ self! Item was added: + ----- Method: RawBitsArray>>integerAt:put:size:signed: (in category '*FFI-Kernel-accessing') ----- + integerAt: byteOffset put: value size: nBytes signed: aBoolean + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:put:." + + ^ self atByteOffset: byteOffset put: value! Item was added: + ----- Method: RawBitsArray>>integerAt:size:signed: (in category '*FFI-Kernel-accessing') ----- + integerAt: byteOffset size: nBytes signed: aBoolean + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset! Item was changed: + ----- Method: RawBitsArray>>isFFIArray (in category '*FFI-Kernel-external data') ----- - ----- Method: RawBitsArray>>isFFIArray (in category '*FFI-Kernel') ----- isFFIArray ^ true! Item was changed: + ----- Method: RawBitsArray>>isNull (in category '*FFI-Kernel-external data') ----- - ----- Method: RawBitsArray>>isNull (in category '*FFI-Kernel') ----- isNull ^ false! Item was changed: + ----- Method: RawBitsArray>>reader (in category '*FFI-Kernel-external data') ----- - ----- Method: RawBitsArray>>reader (in category '*FFI-Kernel') ----- reader ^ self! Item was changed: + ----- Method: RawBitsArray>>setContentType: (in category '*FFI-Kernel-external data') ----- - ----- Method: RawBitsArray>>setContentType: (in category '*FFI-Kernel') ----- setContentType: type "See ExternalData." self shouldNotImplement.! Item was changed: + ----- Method: RawBitsArray>>setSize: (in category '*FFI-Kernel-external data') ----- - ----- Method: RawBitsArray>>setSize: (in category '*FFI-Kernel') ----- setSize: size "See ExternalData." self shouldNotImplement.! Item was changed: + ----- Method: RawBitsArray>>writer (in category '*FFI-Kernel-external data') ----- - ----- Method: RawBitsArray>>writer (in category '*FFI-Kernel') ----- writer ^ self! Item was changed: + ----- Method: RawBitsArray>>zeroMemory (in category '*FFI-Kernel-external data') ----- - ----- Method: RawBitsArray>>zeroMemory (in category '*FFI-Kernel') ----- zeroMemory self atAllPut: 0.!

1 0

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

21 May '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.164.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.164 Author: mt Time: 21 May 2021, 11:22:51.005285 am UUID: ce4d8f9a-e8bb-564e-9714-b5d5426178b6 Ancestors: FFI-Kernel-mt.163 I forgot the addition of #from: to the other FFI-arrays (#isFFIArray). =============== Diff against FFI-Kernel-mt.163 =============== Item was added: + ----- Method: ByteString>>from: (in category '*FFI-Kernel') ----- + from: firstIndex + "See ExternalData" + + ^ self copyFrom: firstIndex to: self size! Item was added: + ----- Method: RawBitsArray>>from: (in category '*FFI-Kernel') ----- + from: firstIndex + "See ExternalData" + + ^ self copyFrom: firstIndex to: self size!

1 0

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

21 May '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.163.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.163 Author: mt Time: 21 May 2021, 11:13:45.365138 am UUID: c175e00a-7423-de4a-8e42-e1fdf6ffb4c9 Ancestors: FFI-Kernel-mt.162 Adds out-of-bounds checks for byte-array handles in composite structures. Adds #first: #last: #from: to ExternalData extract handles for backwards-filled buffers. Relax #sizeCheck: in ExternalData to allow for moving back-and-forth in memory. Complements FFI-Tests-mt.45. =============== Diff against FFI-Kernel-mt.162 =============== Item was added: + ----- Method: ByteArrayReadWriter>>checkAt: (in category 'private') ----- + checkAt: nextByteOffset + + | endOffset | + (endOffset := nextByteOffset + byteOffset) > (byteOffset + byteSize) + ifTrue: [self errorSubscriptBounds: endOffset].! Item was added: + ----- Method: ByteArrayReadWriter>>checkAt:length: (in category 'private') ----- + checkAt: nextByteOffset length: numBytes + + | endOffset | + (endOffset := nextByteOffset + numBytes - 1) > (byteOffset + byteSize) + ifTrue: [self errorSubscriptBounds: endOffset].! Item was changed: ----- Method: ByteArrayReadWriter>>doubleAt: (in category 'read/write atomics') ----- doubleAt: oByteOffset + self checkAt: oByteOffset. ^ byteArray doubleAt: oByteOffset + byteOffset! Item was changed: ----- Method: ByteArrayReadWriter>>doubleAt:put: (in category 'read/write atomics') ----- doubleAt: oByteOffset put: value + self checkAt: oByteOffset. ^ byteArray doubleAt: oByteOffset + byteOffset put: value! Item was changed: ----- Method: ByteArrayReadWriter>>floatAt: (in category 'read/write atomics') ----- floatAt: oByteOffset + self checkAt: oByteOffset. ^ byteArray floatAt: oByteOffset + byteOffset! Item was changed: ----- Method: ByteArrayReadWriter>>floatAt:put: (in category 'read/write atomics') ----- floatAt: oByteOffset put: value + self checkAt: oByteOffset. ^ byteArray floatAt: oByteOffset + byteOffset put: value! Item was changed: ----- Method: ByteArrayReadWriter>>integerAt:put:size:signed: (in category 'read/write atomics') ----- integerAt: oByteOffset put: value size: nBytes signed: aBoolean + self checkAt: oByteOffset. ^ byteArray integerAt: oByteOffset + byteOffset put: value size: nBytes signed: aBoolean! Item was changed: ----- Method: ByteArrayReadWriter>>integerAt:size:signed: (in category 'read/write atomics') ----- integerAt: oByteOffset size: nBytes signed: aBoolean + self checkAt: oByteOffset. ^ byteArray integerAt: oByteOffset + byteOffset size: nBytes signed: aBoolean.! Item was changed: ----- Method: ByteArrayReadWriter>>pointerAt:length: (in category 'read/write pointers') ----- pointerAt: oByteOffset length: numBytes + self checkAt: oByteOffset length: numBytes. ^ byteArray pointerAt: oByteOffset + byteOffset length: numBytes! Item was changed: ----- Method: ByteArrayReadWriter>>pointerAt:put:length: (in category 'read/write pointers') ----- pointerAt: oByteOffset put: value length: numBytes + self checkAt: oByteOffset length: numBytes. ^ byteArray pointerAt: oByteOffset + byteOffset put: value length: numBytes! Item was changed: ----- Method: ByteArrayReadWriter>>structAt:length: (in category 'read/write structs') ----- structAt: newByteOffset length: newLength + self checkAt: newByteOffset length: newLength. ^ ByteArrayReadWriter new setArray: byteArray offset: byteOffset + newByteOffset - 1 size: newLength! Item was changed: ----- Method: ByteArrayReadWriter>>structAt:put:length: (in category 'read/write structs') ----- structAt: newByteOffset put: value length: newLength + self checkAt: newByteOffset length: newLength. - (newByteOffset + newLength > byteSize) - ifTrue: [self errorSubscriptBounds: newByteOffset + newLength]. - ^ byteArray structAt: byteOffset + newByteOffset - 1 put: value length: newLength! Item was added: + ----- Method: ExternalData>>first: (in category 'accessing') ----- + first: n + "Answer the first n elements of the receiver." + + ^ self from: 1 to: n! Item was added: + ----- Method: ExternalData>>from: (in category 'accessing') ----- + from: firstIndex + "Move the start of this array. Size not needed." + + | byteOffset numElements byteSize contentType | + contentType := self contentType. + byteOffset := ((firstIndex-1) * contentType byteSize)+1. + numElements := (self size ifNotNil: [:sz | sz - firstIndex + 1 max: 0]). + byteSize := numElements + ifNil: [contentType byteSize] + ifNotNil: [numElements * contentType byteSize]. + + ^ ExternalData + fromHandle: (handle structAt: byteOffset length: (byteSize ifNil: [1])) + type: contentType + size: numElements! Item was added: + ----- Method: ExternalData>>last: (in category 'accessing') ----- + last: n + "Answer the last n elements of the receiver." + + | sz | + self sizeCheck. + ^ self from: (sz := self size) - n + 1 to: sz! Item was changed: ----- Method: ExternalData>>sizeCheck: (in category 'private') ----- sizeCheck: index + "Negative indices should work to move back-and-forth in the memory." + - | sz | + ((sz := self size) notNil and: [index > sz]) - ((1 > index) or: [(sz := self size) notNil and: [index > sz]]) ifTrue: [^ self errorSubscriptBounds: index].!

1 0

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

21 May '21

Marcel Taeumel uploaded a new version of FFI-Tests to project FFI: http://source.squeak.org/FFI/FFI-Tests-mt.45.mcz ==================== Summary ==================== Name: FFI-Tests-mt.45 Author: mt Time: 21 May 2021, 11:11:03.010138 am UUID: 4632b985-36be-564f-9ddc-e30405f110e9 Ancestors: FFI-Tests-mt.44 More robust tests for the "base type" of atomic types to really check the headerWord. More tests for sub-array access. =============== Diff against FFI-Tests-mt.44 =============== Item was changed: ----- Method: ExternalTypeTests>>testBasicTypeForAtomicType (in category 'tests - compiled spec') ----- testBasicTypeForAtomicType + "Check all information about atomics compiled in the compiledSpec's headerWord. While there might be polymorphic optimizations for in-image type checking, the basic type MUST contain all that information, too. Some checks will signal errors, which is okay as long as there are errors for the basic type, too." + + ExternalType atomicTypes do: [:type | + | baseType | + baseType := type asBasicType. + #(isAtomic atomicType byteSize size + isIntegerType isFloatType isCharType isBoolType isVoid + isEmpty) + do: [:selector | + self + assert: (type perform: selector) + equals: (baseType perform: selector)]. + #(isSigned isUnsigned isSinglePrecision isDoublePrecision) + do: [:selector | + self + assert: ([type perform: selector] on: Error do: [#error]) + equals: ([baseType perform: selector] on: Error do: [#error])]].! - - | type baseType | - type := ExternalType int32_t. - baseType := type asBasicType. - self assert: type isAtomic equals: baseType isAtomic. - self assert: type byteSize equals: baseType byteSize. - self assert: type size equals: baseType size. ! Item was added: + ----- Method: FFIAllocateExternalTests>>test17ArrayFromUnkownSize (in category 'tests - array') ----- + test17ArrayFromUnkownSize + "Overwritten because there is no out-of-bounds check for external memory." + + | array portion | + array := self allocate: 'int32_t' size: 5. + 1 to: array size do: [:index | array at: index put: index]. + + array setSize: nil. "Possible but limited for byte-array handles." + portion := array reader from: 3. + self assert: 3 equals: (portion at: 1). + self assert: 4 equals: (portion at: 2).! Item was added: + ----- Method: FFIAllocateTests>>test13ArrayFirst (in category 'tests - array') ----- + test13ArrayFirst + "Access a sub-range in the external data." + + | array portion | + array := self allocate: 'int32_t' size: 5. + 1 to: array size do: [:index | array at: index put: index]. + + array setSize: nil. "Not needed for #first:." + portion := array reader first: 2. + self assert: #(1 2) equals: (portion collect: #yourself). + + portion at: 2 put: 42. + self assert: 42 equals: (array at: 2).! Item was added: + ----- Method: FFIAllocateTests>>test14ArrayLast (in category 'tests - array') ----- + test14ArrayLast + "Access a sub-range in the external data." + + | array portion | + array := self allocate: 'int32_t' size: 5. + 1 to: array size do: [:index | array at: index put: index]. + + portion := array reader last: 2. + self assert: #(4 5) equals: (portion collect: #yourself). + + portion at: 2 put: 42. + self assert: 42 equals: (array at: 5).! Item was added: + ----- Method: FFIAllocateTests>>test15ArrayLastError (in category 'tests - array') ----- + test15ArrayLastError + "Access a sub-range in the external data. Error for unknown size because #last: needs to access the end of the array." + + | array | + array := self allocate: 'int32_t' size: 5. + array setSize: nil. + self should: [array last: 2] raise: Error.! Item was added: + ----- Method: FFIAllocateTests>>test16ArrayFrom (in category 'tests - array') ----- + test16ArrayFrom + "Access a sub-range in the external data by moving the start of the array." + + | array portion | + array := self allocate: 'int32_t' size: 5. + 1 to: array size do: [:index | array at: index put: index]. + + portion := array reader from: 3. + self assert: #(3 4 5) equals: (portion collect: #yourself).! Item was added: + ----- Method: FFIAllocateTests>>test17ArrayFromUnkownSize (in category 'tests - array') ----- + test17ArrayFromUnkownSize + "Access a sub-range in the external data by moving the start of the array." + + | array portion | + array := self allocate: 'int32_t' size: 5. + 1 to: array size do: [:index | array at: index put: index]. + + array setSize: nil. "Possible but limited for byte-array handles." + portion := array reader from: 3. + self assert: 3 equals: (portion at: 1). + self should: [portion at: 2] raise: Error.! Item was added: + ----- Method: FFIAllocateTests>>test18ArrayMoveBackAndForth (in category 'tests - array') ----- + test18ArrayMoveBackAndForth + "Check whether it is possible to move back-and-forth in memory without keeping track of the original array." + + | array portion | + array := self allocate: 'int32_t' size: 5. + 1 to: array size do: [:index | array at: index put: index]. + + portion := array reader from: 3. + self assert: 3 equals: (portion at: 1). + portion := portion from: 0. + self assert: 2 equals: (portion at: 1). + + portion := array reader from: 3. + self assert: 3 equals: (portion at: 1). + portion := portion from: -1. + self assert: 1 equals: (portion at: 1). + + portion := portion from: 4. + self assert: 4 equals: (portion at: 1).!

1 0

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

21 May '21

Marcel Taeumel uploaded a new version of FFI-Tools to project FFI: http://source.squeak.org/FFI/FFI-Tools-mt.35.mcz ==================== Summary ==================== Name: FFI-Tools-mt.35 Author: mt Time: 21 May 2021, 11:09:41.766138 am UUID: 9978c435-751b-4c43-ad0e-8419760825ae Ancestors: FFI-Tools-mt.34 Fixes visual glitch now that "contentType" is cached as instVar in ExternalData. =============== Diff against FFI-Tools-mt.34 =============== Item was changed: ----- Method: ExternalData>>explorerContentsMetaFields (in category '*FFI-Tools') ----- explorerContentsMetaFields "Skip _type because our external type is already in the basic explorer fields because it is an instance variable. Add _contentType for clarification." ^ { ObjectExplorerWrapper with: self containerType name: '_containerType' model: self. - ObjectExplorerWrapper with: self contentType name: '_contentType' model: self. }!

1 0

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

20 May '21

Marcel Taeumel uploaded a new version of FFI-Tests to project FFI: http://source.squeak.org/FFI/FFI-Tests-mt.44.mcz ==================== Summary ==================== Name: FFI-Tests-mt.44 Author: mt Time: 20 May 2021, 7:37:42.74558 pm UUID: e6517ef7-61b3-3249-a8b0-a85f226a877d Ancestors: FFI-Tests-mt.43 Complements FFI-Kernel-mt.162 =============== Diff against FFI-Tests-mt.43 =============== Item was changed: ----- Method: FFIAllocateTests>>performTest (in category 'running') ----- performTest "Tests should opt-in to have more control." + | prior1 prior2 | + prior1 := ExternalType useArrayClasses. + prior2 := ExternalData extraSizeChecks. - | prior | - prior := ExternalType useArrayClasses. [ExternalType useArrayClasses: false. + ExternalData extraSizeChecks: true. super performTest] + ensure: [ + ExternalType useArrayClasses: prior1. + ExternalData extraSizeChecks: prior2].! - ensure: [ExternalType useArrayClasses: prior].!

1 0

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

20 May '21

Marcel Taeumel uploaded a new version of FFI-Tools to project FFI: http://source.squeak.org/FFI/FFI-Tools-mt.34.mcz ==================== Summary ==================== Name: FFI-Tools-mt.34 Author: mt Time: 20 May 2021, 7:35:45.65158 pm UUID: b4e13008-ef6e-5240-8777-6322a3d3edc8 Ancestors: FFI-Tools-mt.33 Complements FFI-Kernel-mt.162 =============== Diff against FFI-Tools-mt.33 =============== Item was changed: ----- Method: ExternalData>>explorerContents (in category '*FFI-Tools') ----- explorerContents "Prefix all instance variables and append extra meta information (e.g., the external type) as well as all structure fields as defined in #fields." | basicExplorerFields | basicExplorerFields := super explorerContents. basicExplorerFields do: [:explorerField | explorerField itemName = '_type' ifTrue: [ + explorerField object: self externalType]]. - explorerField itemName: '_containerType']]. ^ basicExplorerFields! Item was changed: ----- Method: ExternalData>>explorerContentsMetaFields (in category '*FFI-Tools') ----- explorerContentsMetaFields "Skip _type because our external type is already in the basic explorer fields because it is an instance variable. Add _contentType for clarification." ^ { + ObjectExplorerWrapper with: self containerType name: '_containerType' model: self. ObjectExplorerWrapper with: self contentType name: '_contentType' model: self. }!

1 0

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

20 May '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.162.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.162 Author: mt Time: 20 May 2021, 7:35:06.00258 pm UUID: 438d5218-def5-7e48-8016-e53905db2a19 Ancestors: FFI-Kernel-mt.161 For genuine atomic types (i.e. no type alias), speeds up dynamic array access, i.e. ExternalData >> #at:(put:). For all types, also speed up pointer/non-pointer conversion and #isVoid check. =============== Diff against FFI-Kernel-mt.161 =============== Item was added: + ----- Method: ExternalArrayType>>asNonPointerType (in category 'converting') ----- + asNonPointerType + + ^ self! Item was added: + ----- Method: ExternalArrayType>>asPointerType (in category 'converting') ----- + asPointerType + + ^ referencedType! Item was added: + ----- Method: ExternalArrayType>>isVoid (in category 'testing') ----- + isVoid + + ^ false! Item was added: + ----- Method: ExternalAtomicType>>asNonPointerType (in category 'converting') ----- + asNonPointerType + + ^ self! Item was added: + ----- Method: ExternalAtomicType>>asPointerType (in category 'converting') ----- + asPointerType + + ^ referencedType! Item was added: + ----- Method: ExternalAtomicType>>handle:atIndex: (in category 'external data') ----- + handle: handle atIndex: index + "Overwritten to use cached byteSize in atomic sends for performance." + + referentClass == nil ifTrue: [ + ^ (AtomicSends at: self atomicType + 1) first + handle: handle + atIndex: index]. + ^ super handle: handle atIndex: index! Item was added: + ----- Method: ExternalAtomicType>>handle:atIndex:put: (in category 'external data') ----- + handle: handle atIndex: index put: value + "Overwritten to use cached byteSize in atomic sends for performance." + + referentClass == nil ifTrue: [ + ^ (AtomicSends at: self atomicType + 1) second + handle: handle + atIndex: index + put: value]. + ^ super handle: handle atIndex: index put: value! Item was added: + ----- Method: ExternalAtomicType>>isVoid (in category 'testing') ----- + isVoid + + ^ self atomicType = 0! Item was changed: ExternalStructure subclass: #ExternalData + instanceVariableNames: 'type contentType' + classVariableNames: 'AllowDetectForUnknownSize ExtraSizeChecks' - instanceVariableNames: 'type' - classVariableNames: 'AllowDetectForUnknownSize' poolDictionaries: '' category: 'FFI-Kernel'! !ExternalData commentStamp: 'mt 6/13/2020 17:26' prior: 0! Instances of ExternalData explicitly describe objects with associated type. They can be used for describing atomic C types like arrays of atomic types (e.g., 'int[]') or pointer to atomic types (e.g., 'int *'). Instance variables: type <ExternalType> The external type of the receiver. Always a pointer type. The encoding of type is equivalent to that of the basic type in class ExternalType. The interpretation of whether the receiver describes an array of data or a pointer to data depends on the contents of the instance variable 'handle'. If handle contains an ExternalAddress the receiver is treated as pointer to type. If the handle contains a ByteArray the receiver is interpreted as describing an array of type. Note that both interpretations are treated equivalent in external calls, e.g., if one describes an argument to an external call as taking 'int*' then, depending on the type of handle either the actual contents (if ExternalAddress) or a pointer to the contents (if ByteArray) is passed. ! Item was added: + ----- Method: ExternalData class>>extraSizeChecks (in category 'preferences') ----- + extraSizeChecks + <preference: 'Extra size checks' + categoryList: #('FFI Kernel') + description: 'When true, there will be extra out-of-bounds checks when accessing external data with a known array size.' + type: #Boolean> + ^ ExtraSizeChecks ifNil: [false]! Item was added: + ----- Method: ExternalData class>>extraSizeChecks: (in category 'preferences') ----- + extraSizeChecks: aBoolean + + ExtraSizeChecks := aBoolean.! Item was changed: ----- Method: ExternalData>>arrayType (in category 'accessing - types') ----- arrayType "Answer this container's array type or 'nil' if unknown." | arrayType | + ^ (arrayType := self containerType) isVoid - type ifNil: [^ nil]. - arrayType := self containerType asNonPointerType. - ^ arrayType isVoid - ifTrue: [nil] ifFalse: [arrayType]! Item was changed: ----- Method: ExternalData>>at: (in category 'accessing') ----- at: index + ExtraSizeChecks == true ifTrue: [self sizeCheck: index]. - ((1 > index) or: [self size notNil and: [index > self size]]) - ifTrue: [^ self errorSubscriptBounds: index]. ^ self contentType handle: handle + atIndex: index! - at: ((index-1) * self contentType byteSize) + 1! Item was changed: ----- Method: ExternalData>>at:put: (in category 'accessing') ----- at: index put: value + ExtraSizeChecks == true ifTrue: [self sizeCheck: index]. + - ((1 > index) or: [self size notNil and: [index > self size]]) - ifTrue: [^ self errorSubscriptBounds: index]. - ^ self contentType handle: handle + atIndex: index - at: ((index-1) * self contentType byteSize) + 1 put: value! Item was changed: ----- Method: ExternalData>>contentType (in category 'accessing - types') ----- contentType "^ <ExternalType>" "Answer the content type for the current container type." + ^ contentType ifNil: [ + contentType := self arrayType + ifNil: [ExternalType void] + ifNotNil: [:arrayType | arrayType contentType]]! - ^ self arrayType - ifNil: [ExternalType void] - ifNotNil: [:arrayType | arrayType contentType]! Item was changed: ----- Method: ExternalData>>externalType (in category 'accessing - types') ----- externalType "^ <ExternalType>" "Overwritten to answer our #containerType, which is important so that clients can then send #byteSize to the result." + + ^ handle isExternalAddress + ifTrue: [self containerType asPointerType] + ifFalse: [self containerType asNonPointerType]! - - ^ self containerType! Item was changed: ----- Method: ExternalData>>from:to: (in category 'accessing') ----- from: firstIndex to: lastIndex "Only copy data if already in object memory, that is, as byte array. Only check size if configured." | byteOffset numElements byteSize contentType | + ExtraSizeChecks == true ifTrue: [ + self sizeCheck: firstIndex. + self sizeCheck: lastIndex]. - ((1 > firstIndex) or: [self size notNil and: [lastIndex > self size]]) - ifTrue: [^ self errorSubscriptBounds: lastIndex]. contentType := self contentType. byteOffset := ((firstIndex-1) * contentType byteSize)+1. numElements := lastIndex - firstIndex + 1 max: 0. byteSize := numElements * contentType byteSize. ^ ExternalData fromHandle: (handle structAt: byteOffset length: byteSize) type: contentType size: numElements! Item was changed: ----- Method: ExternalData>>setType: (in category 'private') ----- setType: externalType "Private. Set the type used to derive content and container types. If you want to change the content type later, use #setContentType:." externalType = ExternalType string ifTrue: [ ^ self setType: externalType asNonPointerType]. + (externalType isArrayType or: [externalType isVoid]) - (externalType asNonPointerType isArrayType or: [externalType isVoid]) ifTrue: [type := externalType] ifFalse: [type := (externalType asArrayType: nil)]. + contentType := nil.! - handle isExternalAddress - ifTrue: [type := type asPointerType] - ifFalse: [type := type asNonPointerType].! Item was added: + ----- Method: ExternalData>>sizeCheck: (in category 'private') ----- + sizeCheck: index + + | sz | + ((1 > index) or: [(sz := self size) notNil and: [index > sz]]) + ifTrue: [^ self errorSubscriptBounds: index].! Item was changed: ----- Method: ExternalData>>typeCheck (in category 'private') ----- typeCheck "Check type. If you happen to have a regular pointer type here, convert it into array type of unknown size. This can happen for result values of FFI calls if the signature did not specify, e.g., 'int[]' but 'int*'." + type asNonPointerType isVoid "void*" - type asNonPointerType isVoid ifTrue: [^ self]. + type isArrayType - type asNonPointerType isArrayType ifFalse: [self setType: type "int*" asNonPointerType "int ... to become int[], not int*[]"].! Item was added: + ----- Method: ExternalPointerType>>asNonPointerType (in category 'converting') ----- + asNonPointerType + + ^ referencedType! Item was added: + ----- Method: ExternalPointerType>>asPointerType (in category 'converting') ----- + asPointerType + + ^ self! Item was added: + ----- Method: ExternalPointerType>>isVoid (in category 'testing') ----- + isVoid + + ^ false! Item was added: + ----- Method: ExternalStructureType>>asNonPointerType (in category 'converting') ----- + asNonPointerType + + ^ self! Item was added: + ----- Method: ExternalStructureType>>asPointerType (in category 'converting') ----- + asPointerType + + ^ referencedType! Item was added: + ----- Method: ExternalStructureType>>isVoid (in category 'testing') ----- + isVoid + + ^ false! Item was added: + ----- Method: ExternalType>>handle:atIndex: (in category 'external data') ----- + handle: handle atIndex: index + + ^ self + handle: handle + at: ((index-1) * self byteSize) + 1! Item was added: + ----- Method: ExternalType>>handle:atIndex:put: (in category 'external data') ----- + handle: handle atIndex: index put: value + + ^ self + handle: handle + at: ((index-1) * self byteSize) + 1 + put: value! Item was changed: MessageSend subclass: #FFIAtomicReadWriteSend + instanceVariableNames: 'byteSize' - instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'FFI-Kernel-Support'! !FFIAtomicReadWriteSend commentStamp: 'mt 5/19/2021 10:20' prior: 0! I am a message send for reading and writing atomic values from and to byte arrays or external addresses. I can help with code generation through #template. Take a look at ExternalType class >> #initializeAtomicSends.! Item was added: + ----- Method: FFIAtomicReadWriteSend>>byteSize (in category 'accessing') ----- + byteSize + + ^ byteSize! Item was added: + ----- Method: FFIAtomicReadWriteSend>>byteSize: (in category 'accessing') ----- + byteSize: numBytes + + byteSize := numBytes.! Item was changed: ----- Method: FFIAtomicReadWriteSend>>handle:at:put: (in category 'evaluating') ----- + handle: receiver at: byteOffset put: value - handle: receiver at: byteOffset put: floatValue self subclassResponsibility.! Item was added: + ----- Method: FFIAtomicReadWriteSend>>handle:atIndex: (in category 'evaluating') ----- + handle: receiver atIndex: index + + ^ self + handle: receiver + at: ((index-1) * self byteSize) + 1! Item was added: + ----- Method: FFIAtomicReadWriteSend>>handle:atIndex:put: (in category 'evaluating') ----- + handle: receiver atIndex: index put: value + + ^ self + handle: receiver + at: ((index-1) * self byteSize) + 1 + put: value! Item was changed: + ----- Method: FFIAtomicReadWriteSend>>printOn: (in category 'printing') ----- - ----- Method: FFIAtomicReadWriteSend>>printOn: (in category 'nil') ----- printOn: stream stream nextPutAll: self template.! Item was changed: ----- Method: FloatReadWriteSend class>>fromType: (in category 'instance creation') ----- fromType: type | selectors | selectors := self lookupSelectorsFor: type. ^ { + (self - self receiver: nil "handle" selector: selectors first arguments: (Array + with: nil "byteOffset")) + byteSize: type byteSize; + yourself. - with: nil "byteOffset"). + (self - self receiver: nil "handle" selector: selectors second arguments: (Array with: nil "byteOffset" + with: nil "aFloat")) + byteSize: type byteSize; + yourself - with: nil "aFloat") }! Item was changed: ----- Method: IntegerReadWriteSend class>>fromType: (in category 'instance creation') ----- fromType: type "Overwritten to account for byteSize and isSigned." | selectors | selectors := self lookupSelectorsFor: type. ^ { + (self - self receiver: nil "handle" selector: selectors first arguments: (Array with: nil "byteOffset" with: type byteSize + with: type isSigned)) + byteSize: type byteSize; + yourself. - with: type isSigned). + (self - self receiver: nil "handle" selector: selectors second arguments: (Array with: nil "byteOffset" with: nil "integerValue" with: type byteSize + with: type isSigned)) + byteSize: type byteSize; + yourself. - with: type isSigned) - }!

1 0

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

20 May '21

Marcel Taeumel uploaded a new version of FFI-Tools to project FFI: http://source.squeak.org/FFI/FFI-Tools-mt.33.mcz ==================== Summary ==================== Name: FFI-Tools-mt.33 Author: mt Time: 20 May 2021, 4:09:18.82558 pm UUID: 33654c93-d0a2-5143-a683-044770efb5d5 Ancestors: FFI-Tools-mt.32 Fixes issue with printing large byte-array handles in object explorer. Makes the text representation of byte-array handles configurable. =============== Diff against FFI-Tools-mt.32 =============== Item was changed: ObjectExplorerWrapper subclass: #ExternalObjectHandleWrapper instanceVariableNames: '' + classVariableNames: 'MaxVisibleBytes MaxVisibleDots' - classVariableNames: '' poolDictionaries: '' category: 'FFI-Tools'! !ExternalObjectHandleWrapper commentStamp: 'mt 6/8/2020 10:27' prior: 0! I am a wrapper around handles of external objects. I am used in the object explorer tool. My role is to fine-tune the string representation of handles that are neither ByteArray nor ExternalAddress.! Item was added: + ----- Method: ExternalObjectHandleWrapper class>>maxVisibleBytes (in category 'preferences') ----- + maxVisibleBytes + <preference: 'Max. visible bytes in byte arrays' + categoryList: #('FFI Tools') + description: 'Set the maximum number of visible bytes to show when exploring a byte-array handle before trimming the bytes, e.g. #[ 0 0 0 0 ...555 bytes... 0 0 0 0 ]' + type: #Number> + ^MaxVisibleBytes ifNil: [32]! Item was added: + ----- Method: ExternalObjectHandleWrapper class>>maxVisibleBytes: (in category 'preferences') ----- + maxVisibleBytes: anInteger + + MaxVisibleBytes := anInteger ifNotNil: [:i | i rounded].! Item was added: + ----- Method: ExternalObjectHandleWrapper class>>maxVisibleDots (in category 'preferences') ----- + maxVisibleDots + <preference: 'Max. visible dots in byte arrays' + categoryList: #('FFI Tools') + description: 'Set the maximum number of visible dots to show when exploring a byte-array handle before summarizing the skipped bytes in composite structs, e.g. #[ . . . . . . . . 0 0 0 0 ...356 bytes... ]' + type: #Number> + ^MaxVisibleDots ifNil:[12]! Item was added: + ----- Method: ExternalObjectHandleWrapper class>>maxVisibleDots: (in category 'preferences') ----- + maxVisibleDots: anInteger + + MaxVisibleDots := anInteger ifNotNil: [:i | i rounded].! Item was removed: - ----- Method: ExternalObjectHandleWrapper>>getHandle (in category 'accessing') ----- - getHandle - - ^ self object! Item was changed: ----- Method: ExternalObjectHandleWrapper>>objectString (in category 'accessing') ----- objectString + ^ String streamContents: [:stream | + (thisContext objectClass: self object) == ByteArrayReadWriter + ifTrue: [self printReadWriterOn: stream] + ifFalse: [stream nextPutAll: super objectString]]! - | label handle skipLimit | - label := super objectString. - handle := self getHandle. - skipLimit := 16. - - ^ handle isExternalAddress ifTrue: [label] ifFalse: [ - (thisContext objectClass: handle) == ByteArrayReadWriter - ifFalse: [label] - ifTrue: [ | begin end tokens | - label :=(thisContext object: handle instVarAt: 3) "byteArray" printString. - label := label copyFrom: 3 to: (label size - 1). - begin := (thisContext object: handle instVarAt: 1) "byteOffset" + 1. - end := begin - 1 + (thisContext object: handle instVarAt: 2) "byteSize". - String streamContents: [:stream | - stream nextPutAll: '#[ '. - tokens := label findTokens: ' ' "#[0 0 0 0 0]". - begin > skipLimit ifTrue: [ - stream nextPutAll: '. . ', (begin - 1) asString, ' bytes . . '. - tokens := tokens allButFirst: begin - 1. - end := end - begin + 1. begin := 1]. - (1 to: end) do: [:index | | token | - token := tokens at: index. - index >= begin - ifTrue: [stream nextPutAll: token] - ifFalse: ["Skip byte info" stream nextPut: $.]. - stream space]. - (tokens size - end + 1) > skipLimit ifTrue: [ - stream nextPutAll: '. . ', (tokens size - end) asString, ' bytes . . '. - tokens := tokens allButLast: tokens size - end. - end := tokens size]. - (tokens size - end) timesRepeat: [ - "Skip byte info" stream nextPut: $.. - stream space]. - stream nextPutAll: ']'. - ]]].! Item was added: + ----- Method: ExternalObjectHandleWrapper>>printReadWriterOn: (in category 'printing') ----- + printReadWriterOn: stream + + | handle array head tail numBytes maxVisibleDots maxVisibleBytes | + handle := self object. + maxVisibleDots := 12. "e.g. #[ . . . . . . . . 0 0 0 0 ...356 bytes... ]" + maxVisibleBytes := 32. "e.g. #[ 0 0 0 0 ...555 bytes... 0 0 0 0 ]" + + array := (thisContext object: handle instVarAt: 3) "byteArray". + head := (thisContext object: handle instVarAt: 1) "byteOffset". + numBytes := (thisContext object: handle instVarAt: 2) "byteSize". + tail := array size - head - numBytes. + + stream nextPutAll: '#[ '. + + head > 0 ifTrue: [ + head > maxVisibleDots + ifTrue: [stream nextPutAll: '...', head asString, ' bytes... '] + ifFalse: [head timesRepeat: [stream nextPut: $.; space]]]. + + numBytes > maxVisibleBytes + ifTrue: [ "Trim inner bytes" + head + 1 to: head + (maxVisibleBytes / 2) do: [:index | + stream nextPutAll: (array at: index) asString; space]. + stream nextPutAll: '...', (numBytes - maxVisibleBytes) asString, ' bytes... '. + array size - tail - (maxVisibleBytes / 2) + 1 to: array size - tail do: [:index | + stream nextPutAll: (array at: index) asString; space]] + ifFalse: [ "No trimming" + head + 1 to: array size - tail do: [:index | + stream nextPutAll: (array at: index) asString; space]]. + + tail > 0 ifTrue: [ + tail > maxVisibleDots + ifTrue: [stream nextPutAll: '...', tail asString, ' bytes... '] + ifFalse: [tail timesRepeat: [stream nextPut: $.; space]]]. + + stream nextPutAll: ']'. + !

1 0

The Trunk: Monticello-ct.747.mcz
by commits＠source.squeak.org 20 May '21

20 May '21

Marcel Taeumel uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-ct.747.mcz ==================== Summary ==================== Name: Monticello-ct.747 Author: ct Time: 7 May 2021, 11:45:19.014241 pm UUID: 2cb0b275-8fb5-b149-b46d-41387d4d8f1f Ancestors: Monticello-ct.746 Fixes a bug in MCHttpRespository(MCFileBasedRepository) >> #versionNamed: that occurred when the repository did not contain the requested version. As the comment in the superclass states, answer nil in this case instead of raising a NetworkError. To do this, raise a more precise NotFound error in MCHttpRepository >> #webClientDo: if the version does not exist. I checked all other senders and handlers of the NetworkError; no one else depends on the old behavior. =============== Diff against Monticello-ct.746 =============== Item was changed: ----- Method: MCFileBasedRepository>>versionNamed: (in category 'versions') ----- versionNamed: aMCVersionName "For FileBased repositories, aMCVersionName must have the appropriate extension!! :-(" | version | version := self cache at: aMCVersionName ifAbsent: [ [ self loadVersionFromFileNamed: aMCVersionName ] + on: FileDoesNotExistException , NotFound - on: FileDoesNotExistException do: [ : err | nil ] ]. self resizeCache: cache. (version notNil and: [ version isCacheable ]) ifTrue: [ cache at: aMCVersionName asMCVersionName put: version ]. ^ version! Item was changed: ----- Method: MCHttpRepository>>webClientDo: (in category 'private') ----- webClientDo: aBlock | client attemptsLeft response result | self class useSharedWebClientInstance ifTrue: [ "Acquire webClient by atomically storing it in the client variable and setting its value to nil." client := webClient. webClient := nil ]. client ifNil: [ client := WebClient new ] ifNotNil: [ "Attempt to avoid an error by recreating the underlying stream." client isConnected ifFalse: [ client close ] ]. attemptsLeft := 3. response := nil. [ response isNil and: [ attemptsLeft > 0 ] ] whileTrue: [ response := [ aBlock value: client ] on: NetworkError do: [ :error | attemptsLeft = 0 ifTrue: [ error pass ]. (3 - attemptsLeft) seconds asDelay wait. attemptsLeft := attemptsLeft - 1. nil "The response" ] ]. result := (response code between: 200 and: 299) ifFalse: [ response content. "Make sure content is read." nil ] ifTrue: [ (RWBinaryOrTextStream with: ( response contentWithProgress: [ :total :amount | HTTPProgress new total: total; amount: amount; signal ])) reset ]. self class useSharedWebClientInstance ifTrue: [ "Save the WebClient instance for reuse, but only if there is no client cached." webClient ifNil: [ webClient := client ] ifNotNil: [ client close ] ] ifFalse: [ client close ]. + (response code = 404 "Not Found" or: [response code = 410 "Gone"]) ifTrue: [ + "Need to distinguish between lookup errors and connection errors. Lookup errors will be handled by some senders following the EAFP principle. See #versionNamed:." + (NotFound object: response url) signal ]. result ifNil: [ NetworkError signal: 'Could not access ', location ]. ^result!

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
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