Skip to content

Cleanup resolve/pop order to streams queue read requests #5821

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
jasnell merged 1 commit into from
Jan 2, 2026
Merged

Cleanup resolve/pop order to streams queue read requests #5821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions src/workerd/api/streams/queue.c++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,9 @@ void ValueQueue::handlePush(

// Otherwise, pop the next pending read and resolve it. There should be nothing in the queue.
KJ_REQUIRE(state.buffer.empty() && state.queueTotalSize == 0);
state.readRequests.front()->resolve(js, entry->getValue(js));
auto request = kj::mv(state.readRequests.front());
state.readRequests.pop_front();
request->resolve(js, entry->getValue(js));
}

void ValueQueue::handleRead(jsg::Lock& js,
Expand Down Expand Up @@ -707,8 +708,9 @@ void ByteQueue::handlePush(
// We do not need to adjust the pullInto.atLeast here since we are immediately
// fulfilling the read at this point.

pending.resolve(js);
auto request = kj::mv(state.readRequests.front());
state.readRequests.pop_front();
request->resolve(js);
}

// If the entry was consumed completely by the pending read, then we're done!
Expand Down Expand Up @@ -895,8 +897,9 @@ bool ByteQueue::handleMaybeClose(
// Technically, we really shouldn't get here but the case is covered
// just in case.
KJ_ASSERT(state.queueTotalSize == 0);
pending.resolve(js);
auto request = kj::mv(state.readRequests.front());
state.readRequests.pop_front();
request->resolve(js);
return true;
}
KJ_CASE_ONEOF(entry, QueueEntry) {
Expand Down Expand Up @@ -945,8 +948,9 @@ bool ByteQueue::handleMaybeClose(
// state.queueTotalSize happens to be zero, we can safely indicate that we
// have read the remaining data as this may have been the last actual value
// entry in the buffer.
pending.resolve(js);
auto request = kj::mv(state.readRequests.front());
state.readRequests.pop_front();
request->resolve(js);

if (state.queueTotalSize == 0) {
// If the queueTotalSize is zero at this point, the next item in the queue
Expand Down Expand Up @@ -979,8 +983,9 @@ bool ByteQueue::handleMaybeClose(
// buffer.
KJ_ASSERT(state.queueTotalSize > 0);

pending.resolve(js);
auto request = kj::mv(state.readRequests.front());
state.readRequests.pop_front();
request->resolve(js);
return false;
}
}
Expand Down
8 changes: 6 additions & 2 deletions src/workerd/api/streams/queue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,16 +433,20 @@ class ConsumerImpl final {
auto& ready = state.requireActiveUnsafe();
KJ_REQUIRE(!ready.readRequests.empty());
KJ_REQUIRE(&req == ready.readRequests.front().get());
req.resolve(js);
// Pop the request before resolving to ensure the request is fully owned locally.
auto request = kj::mv(ready.readRequests.front());
ready.readRequests.pop_front();
request->resolve(js);
}

void resolveReadAsDone(jsg::Lock& js, ReadRequest& req) {
auto& ready = state.requireActiveUnsafe();
KJ_REQUIRE(!ready.readRequests.empty());
KJ_REQUIRE(&req == ready.readRequests.front().get());
req.resolveAsDone(js);
// Pop the request before resolving to ensure the request is fully owned locally.
auto request = kj::mv(ready.readRequests.front());
ready.readRequests.pop_front();
request->resolveAsDone(js);
}

void cloneTo(jsg::Lock& js, ConsumerImpl& other) {
Expand Down