lee/container
1
0
Fork 0
mirror of https://github.com/apple/container.git synced 2026-09-12 18:55:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Transition to actors (#225)

Browse Source 
Due to the reduced use of the macro, we can now fully transition to
`Mutex`.
This commit is contained in:
Dmitry Kovba
2025-07-29 08:10:48 -04:00
committed by GitHub
parent 95978185fd
commit d512fcb7cc
16 changed files with 31 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/ContainerizationExtras/IndexedAddressAllocator.swift
+6 -6
View File
@@ -44,7 +44,7 @@ package final class IndexedAddressAllocator<AddressType: CustomStringConvertible
}
}
private let stateGuard: Mutex<State>
private let state: Mutex<State>
/// Create an allocator with specified size and index mappings.
package init(
@@ -57,11 +57,11 @@ package final class IndexedAddressAllocator<AddressType: CustomStringConvertible
addressToIndex: addressToIndex,
indexToAddress: indexToAddress
)
self.stateGuard = Mutex(state)
self.state = Mutex(state)
}
public func allocate() throws -> AddressType {
try self.stateGuard.withLock { state in
try self.state.withLock { state in
guard state.enabled else {
throw AllocatorError.allocatorDisabled
}
@@ -81,7 +81,7 @@ package final class IndexedAddressAllocator<AddressType: CustomStringConvertible
}
package func reserve(_ address: AddressType) throws {
try self.stateGuard.withLock { state in
try self.state.withLock { state in
guard state.enabled else {
throw AllocatorError.allocatorDisabled
}
@@ -101,7 +101,7 @@ package final class IndexedAddressAllocator<AddressType: CustomStringConvertible
}
package func release(_ address: AddressType) throws {
try self.stateGuard.withLock { state in
try self.state.withLock { state in
guard let index = state.addressToIndex(address) else {
throw AllocatorError.invalidAddress(address.description)
}
@@ -116,7 +116,7 @@ package final class IndexedAddressAllocator<AddressType: CustomStringConvertible
}
package func disableAllocator() -> Bool {
self.stateGuard.withLock { state in
self.state.withLock { state in
guard state.allocationCount == 0 else {
return false
}
Sources/ContainerizationExtras/RotatingAddressAllocator.swift
+6 -6
View File
@@ -39,7 +39,7 @@ package final class RotatingAddressAllocator: AddressAllocator {
}
}
private let stateGuard: Mutex<State>
private let state: Mutex<State>
/// Create an allocator with specified size and index mappings.
package init(
@@ -52,11 +52,11 @@ package final class RotatingAddressAllocator: AddressAllocator {
addressToIndex: addressToIndex,
indexToAddress: indexToAddress
)
self.stateGuard = Mutex(state)
self.state = Mutex(state)
}
public func allocate() throws -> AddressType {
try self.stateGuard.withLock { state in
try self.state.withLock { state in
guard state.enabled else {
throw AllocatorError.allocatorDisabled
}
@@ -77,7 +77,7 @@ package final class RotatingAddressAllocator: AddressAllocator {
}
package func reserve(_ address: AddressType) throws {
try self.stateGuard.withLock { state in
try self.state.withLock { state in
guard state.enabled else {
throw AllocatorError.allocatorDisabled
}
@@ -97,7 +97,7 @@ package final class RotatingAddressAllocator: AddressAllocator {
}
package func release(_ address: AddressType) throws {
try self.stateGuard.withLock { state in
try self.state.withLock { state in
guard let index = (state.addressToIndex(address)) else {
throw AllocatorError.invalidAddress(address.description)
}
@@ -113,7 +113,7 @@ package final class RotatingAddressAllocator: AddressAllocator {
}
package func disableAllocator() -> Bool {
self.stateGuard.withLock { state in
self.state.withLock { state in
guard state.allocationCount == 0 else {
return false
}