Skip to content

ManagedBuffer.capacity is unavailable on OpenBSD. #456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lorentey merged 2 commits into from
May 15, 2025
Merged

ManagedBuffer.capacity is unavailable on OpenBSD. #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9523b6a
ManagedBuffer.capacity is unavailable on OpenBSD.
3405691582 Mar 29, 2025
25509c0
Update Sources/HashTreeCollections/HashNode/_HashTreeStatistics.swift
3405691582 May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Sources/HashTreeCollections/HashNode/_HashNode+Storage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,15 @@ extension _HashNode.Storage {
bytes += itemAlignment - childAlignment
}

let mincap = (bytes &+ childStride &- 1) / childStride
let object = _HashNode.Storage.create(
minimumCapacity: (bytes &+ childStride &- 1) / childStride
minimumCapacity: mincap
) { buffer in
#if os(OpenBSD)
_HashNodeHeader(byteCapacity: mincap * childStride)
#else
_HashNodeHeader(byteCapacity: buffer.capacity * childStride)
#endif
}

object.withUnsafeMutablePointers { header, elements in
Expand Down
3 changes: 1 addition & 2 deletions Sources/HashTreeCollections/HashNode/_HashTreeStatistics.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,7 @@ extension _HashNode {
// Note: for simplicity, we assume that there is no padding between
// the object header and the storage header.
let start = _getUnsafePointerToStoredProperties(self.raw.storage)
let capacity = self.raw.storage.capacity
let end = $0._memory + capacity * MemoryLayout<_RawHashNode>.stride
let end = $0._memory + $0.byteCapacity
stats.grossBytes += objectHeaderSize + (end - start)

for child in $0.children {
Expand Down