Update the reader's tail to its position if no data is mapped #50
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
nclack
reviewed
Aug 20, 2024
| size_t* const pos = self->holds.pos + reader->id - 1; | ||
| uint8_t* out = self->data + *pos; | ||
| size_t* const tail = self->holds.pos + reader->id - 1; | ||
| uint8_t* out = self->data + *tail; |
There was a problem hiding this comment.
this is a nit and I think you can judge best but I still like pos. It's probably worth noting in a comment that channel_reader holds the next reader tail.
|
|
||
| if (reader->state == ChannelState_Mapped) { | ||
| reader->status = Channel_Expected_Unmapped_Reader; | ||
| goto AdvanceToWriterHead; | ||
| goto AdvanceTailToReaderPos; |
There was a problem hiding this comment.
still want AdvanceToWriterHead for this exception
| @@ -198,7 +198,7 @@ channel_read_map(struct channel* self, struct channel_reader* reader) | |||
| // here. A call to channel_read_unmap() would return early and not advance | |||
| // the reader's bookmarks in that case, so we need to do it here. | |||
| if (!nbytes) { | |||
| goto AdvanceToWriterHead; | |||
| goto AdvanceTailToReaderPos; | |||
There was a problem hiding this comment.
As discussed, replace this w your fix
out = 0;
nbytes = 0;
*pos = self->head;
*tail = reader->pos;and use an else to leave the reader->state Unmapped.
| @@ -208,10 +208,10 @@ channel_read_map(struct channel* self, struct channel_reader* reader) | |||
| return (struct slice){ .beg = out, .end = out + nbytes }; | |||
| Overflow: | |||
| reader->status = Channel_Error; | |||
| AdvanceToWriterHead: | |||
| AdvanceTailToReaderPos: | |||
There was a problem hiding this comment.
The old behavior is probably best for that mapping exception.
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.
We needed to update the reader's tail to the reader's position, not the writer's head.