Draft changes to the io_uring prototype #208
+1,441
−20
WIP, more ~Copyable adoption
commit 10c070abd648bb66da947c77b5a5c645ef1d53fd
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| import struct CSystem.io_uring_sqe | ||
|
|
||
| public enum IORequest: ~Copyable { | ||
| case nop // nothing here | ||
| case openat( | ||
| atDirectory: FileDescriptor, | ||
| path: UnsafePointer<CChar>, | ||
|
There was a problem hiding this comment.
|
||
| FileDescriptor.AccessMode, | ||
| options: FileDescriptor.OpenOptions = FileDescriptor.OpenOptions(), | ||
| @@ -22,71 +22,106 @@ public enum IORequest { | ||
| ) | ||
| case close(File) | ||
|
|
||
| public enum Buffer: ~Copyable { | ||
| case registered(IORingBuffer) | ||
| case unregistered(UnsafeMutableRawBufferPointer) | ||
| } | ||
|
|
||
| public enum File: ~Copyable { | ||
| case registered(IORingFileSlot) | ||
| case unregistered(FileDescriptor) | ||
| } | ||
| } | ||
|
|
||
| @inlinable @inline(__always) | ||
| internal func makeRawRequest_readWrite_registered( | ||
|
There was a problem hiding this comment. Workaround for "can't mix ~Copyable and fallthrough", courtesy of @jckarter <3 |
||
| file: consuming IORequest.File, | ||
| buffer: consuming IORingBuffer, | ||
| offset: UInt64, | ||
| request: consuming RawIORequest | ||
| ) -> RawIORequest { | ||
| switch file { | ||
| case .registered(let regFile): | ||
| request.rawValue.fd = Int32(exactly: regFile.index)! | ||
| request.flags = .fixedFile | ||
| case .unregistered(let fd): | ||
| request.fileDescriptor = fd | ||
| } | ||
| request.buffer = buffer.unsafeBuffer | ||
| request.rawValue.buf_index = UInt16(exactly: buffer.index)! | ||
| request.offset = offset | ||
| return request | ||
| } | ||
|
|
||
| @inlinable @inline(__always) | ||
| internal func makeRawRequest_readWrite_unregistered( | ||
| file: consuming IORequest.File, | ||
| buffer: UnsafeMutableRawBufferPointer, | ||
| offset: UInt64, | ||
| request: consuming RawIORequest | ||
| ) -> RawIORequest { | ||
| switch file { | ||
| case .registered(let regFile): | ||
| request.rawValue.fd = Int32(exactly: regFile.index)! | ||
| request.flags = .fixedFile | ||
| case .unregistered(let fd): | ||
| request.fileDescriptor = fd | ||
| } | ||
| request.buffer = buffer | ||
| request.offset = offset | ||
| return request | ||
| } | ||
|
|
||
| extension IORequest { | ||
| @inlinable @inline(__always) | ||
| public consuming func makeRawRequest() -> RawIORequest { | ||
| var request = RawIORequest() | ||
| switch consume self { | ||
| case .nop: | ||
| request.operation = .nop | ||
| case .openat(let atDirectory, let path, let mode, let options, let permissions, let slot): | ||
| // TODO: use rawValue less | ||
| request.operation = .openAt | ||
| request.fileDescriptor = atDirectory | ||
| request.rawValue.addr = unsafeBitCast(path, to: UInt64.self) | ||
| request.rawValue.open_flags = UInt32(bitPattern: options.rawValue | mode.rawValue) | ||
| request.rawValue.len = permissions?.rawValue ?? 0 | ||
| if let fileSlot = slot { | ||
| request.rawValue.file_index = UInt32(fileSlot.index + 1) | ||
| } | ||
| case .write(let file, let buffer, let offset): | ||
| switch consume buffer { | ||
| case .registered(let buffer): | ||
| request.operation = .writeFixed | ||
| return makeRawRequest_readWrite_registered( | ||
| file: file, buffer: buffer, offset: offset, request: request) | ||
|
|
||
| case .unregistered(let buffer): | ||
| request.operation = .write | ||
| return makeRawRequest_readWrite_unregistered( | ||
| file: file, buffer: buffer, offset: offset, request: request) | ||
| } | ||
| case .read(let file, let buffer, let offset): | ||
|
|
||
| switch consume buffer { | ||
| case .registered(let buffer): | ||
| request.operation = .readFixed | ||
| return makeRawRequest_readWrite_registered( | ||
| file: file, buffer: buffer, offset: offset, request: request) | ||
|
|
||
| case .unregistered(let buffer): | ||
| request.operation = .read | ||
| return makeRawRequest_readWrite_unregistered( | ||
| file: file, buffer: buffer, offset: offset, request: request) | ||
| } | ||
| case .close(let file): | ||
| request.operation = .close | ||
| switch file { | ||
| case .registered(let regFile): | ||
| request.rawValue.file_index = UInt32(regFile.index + 1) | ||
| case .unregistered(let normalFile): | ||
| request.fileDescriptor = normalFile | ||
| } | ||
| } | ||
| return request | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unclear to me how we want to structure this. An enum is… kinda elegant, but I haven't figured out how to express "this enum's associated values are all borrows scoped to some other thing's lifetime" yet.