gluten-mirage: fix read and writev functions #32
Merged
Conversation
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
Signed-off-by: Sven Anderson <sven@anderson.de>
ansiwen
force-pushed
the
master
branch
3 times, most recently
from
69cafa1
to
9617676
Compare
Signed-off-by: Sven Anderson <sven@anderson.de>
anmonteiro
reviewed
Aug 3, 2022
| let cstruct_iovecs = | ||
| List.map | ||
| (fun { Faraday.buffer; off; len } -> | ||
| Cstruct.of_bigarray ~off ~len buffer) | ||
| iovecs | ||
| in | ||
| let len = Cstruct.lenv cstruct_iovecs in |
There was a problem hiding this comment.
It should be easier to create the copy inside the List.map function above. I'll propose a suggestion.
anmonteiro
reviewed
Aug 3, 2022
Comment on lines
96
to
97
| (fun { Faraday.buffer; off; len } -> | ||
| Cstruct.of_bigarray ~off ~len buffer) |
There was a problem hiding this comment.
Suggested change
| (fun { Faraday.buffer; off; len } -> | |
| Cstruct.of_bigarray ~off ~len buffer) | |
| (fun { Faraday.buffer; off; len } -> | |
| let copy = Bigstringaf.copy ~off ~len buffer in | |
| Cstruct.of_bigarray ~off:0 ~len copy) |
There was a problem hiding this comment.
But that (potentially) allocates many small Cstructs, my version allocates only one bigger Cstruct and copies everything into it.
anmonteiro
reviewed
Aug 3, 2022
| Lwt.catch | ||
| (fun () -> | ||
| Flow.writev flow cstruct_iovecs >|= fun x -> | ||
| Flow.write sock.flow data >|= fun x -> |
There was a problem hiding this comment.
Suggested change
| Flow.write sock.flow data >|= fun x -> | |
| Flow.write sock.flow cstruct_iovecs >|= fun x -> |
anmonteiro
reviewed
Aug 3, 2022
Comment on lines
+100
to
+102
| let len = Cstruct.lenv cstruct_iovecs in | ||
| let data = Cstruct.create_unsafe len in | ||
| let _, _ = Cstruct.fillv ~src:cstruct_iovecs ~dst:data in |
There was a problem hiding this comment.
Suggested change
| let len = Cstruct.lenv cstruct_iovecs in | |
| let data = Cstruct.create_unsafe len in | |
| let _, _ = Cstruct.fillv ~src:cstruct_iovecs ~dst:data in |
|
Thank you! |
ansiwen
referenced
this pull request
Aug 5, 2022
This was referenced Aug 9, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This change fixes both the
readandwritevfunctions of the gluten-mirage package:readnow respects the length parameter of the receiving buffer and if the received data is too large, it stores the rest of the data until the next read call.writevcreates a copy of the data now, because theFlow.writevimplementation takes ownership of the data buffers, and can't be reused.The logic of
readcode has been confirmed in this thread: mirage/mirage-flow#46 (comment)The socket type of the
ClientandServeris not a pureMirage_flow.S.flowanymore. Instead it must be created withGluten_mirage.create_socket flow, withflowbeing a value ofMirage_flow.S.flow.