Skip to content

close relayed stream immediately on udx_stream_destroy() #282

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
jthomas43 merged 1 commit into from
Apr 3, 2026
Merged

close relayed stream immediately on udx_stream_destroy() #282

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
2 changes: 1 addition & 1 deletion src/udx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2727,7 +2727,7 @@ udx_stream_destroy (udx_stream_t *stream) {
stream->status |= UDX_STREAM_DESTROYING;

if (stream->relayed) {
close_stream(stream, 0);
close_stream_internal(stream, 0);
return 0;
}

Expand Down
23 changes: 18 additions & 5 deletions test/stream-relay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ on_ack (udx_stream_write_t *req, int status, int unordered) {
assert(status == 0);
// assert(unordered == 0);

uv_stop(&loop);
udx_stream_destroy(&astream);
udx_stream_destroy(&bstream);
udx_stream_destroy(&cstream);
udx_stream_destroy(&dstream);

ack_called = true;
}
Expand All @@ -59,6 +62,16 @@ on_read (udx_stream_t *handle, ssize_t read_len, const uv_buf_t *buf) {
read_called = true;
}

int nclosed;
void
on_close (udx_stream_t *s, int err) {
nclosed++;

if (nclosed == 4) {
uv_stop(&loop);
}
}

int
main () {

Expand Down Expand Up @@ -98,16 +111,16 @@ main () {
e = udx_socket_bind(&dsock, (struct sockaddr *) &daddr, 0);
assert(e == 0);

e = udx_stream_init(&udx, &astream, 1, NULL, NULL);
e = udx_stream_init(&udx, &astream, 1, on_close, NULL);
assert(e == 0);

e = udx_stream_init(&udx, &bstream, 2, NULL, NULL);
e = udx_stream_init(&udx, &bstream, 2, on_close, NULL);
assert(e == 0);

e = udx_stream_init(&udx, &cstream, 3, NULL, NULL);
e = udx_stream_init(&udx, &cstream, 3, on_close, NULL);
assert(e == 0);

e = udx_stream_init(&udx, &dstream, 4, NULL, NULL);
e = udx_stream_init(&udx, &dstream, 4, on_close, NULL);
assert(e == 0);

e = udx_stream_relay_to(&cstream, &bstream);
Expand Down
Loading