Skip to content
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

Jump to bottom

Release Netty ByteBuf after it is consumed by Tyrus #7042

Merged
merged 1 commit into from
Jun 22, 2023
Merged

Release Netty ByteBuf after it is consumed by Tyrus #7042

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
4 changes: 4 additions & 0 deletions webserver/websocket/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
<artifactId>helidon-webserver-websocket</artifactId>
<name>Helidon WebServer WebSocket</name>

<properties>
<surefire.argLine>-Dio.netty.leakDetectionLevel=paranoid</surefire.argLine>
</properties>

<dependencies>
<dependency>
<groupId>io.helidon.webserver</groupId>
Expand Down
14 changes: 8 additions & 6 deletions webserver/websocket/src/main/java/io/helidon/webserver/websocket/WebSocketHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Oracle and/or its affiliates.
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -69,7 +69,7 @@ class WebSocketHandler extends SimpleChannelInboundHandler<Object> {
private final TyrusServerContainer tyrusServerContainer;
private volatile Connection connection;
private final WebSocketEngine.UpgradeInfo upgradeInfo;
private final BufferedEmittingPublisher<ByteBuffer> emitter;
private final BufferedEmittingPublisher<ByteBuf> emitter;

WebSocketHandler(ChannelHandlerContext ctx, String path,
FullHttpRequest upgradeRequest,
Expand Down Expand Up @@ -154,16 +154,18 @@ public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
@Override
protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception {
if (msg instanceof ByteBuf byteBuf) {
emitter.emit(byteBuf.copy().nioBuffer());
emitter.emit(byteBuf.copy());
}
}

private void sendBytesToTyrus(ChannelHandlerContext ctx, ByteBuffer nioBuffer) {
private void sendBytesToTyrus(ChannelHandlerContext ctx, ByteBuf byteBuf) {
// Pass all data to Tyrus spi
ByteBuffer nioBuffer = byteBuf.nioBuffer();
int retries = MAX_RETRIES;
while (nioBuffer.remaining() > 0 && retries-- > 0) {
connection.getReadHandler().handle(nioBuffer);
}
byteBuf.release();

// If we can't push all data to Tyrus, cancel and report problem
if (retries == 0) {
Expand Down Expand Up @@ -223,13 +225,13 @@ public void write(ByteBuffer byteBuffer, CompletionHandler<ByteBuffer> completio
return ctx;
}, webSocketRouting.getExecutorService()).thenAccept(c -> Multi.create(emitter)
.observeOn(webSocketRouting.getExecutorService())
.forEach(byteBuffer -> sendBytesToTyrus(c, byteBuffer))
.forEach(byteBuf -> sendBytesToTyrus(c, byteBuf))
.onError(this::logError)
);
} else {
this.connection = upgradeInfo.createConnection(writer, WebSocketHandler::close);
Multi.create(emitter)
.forEach(byteBuffer -> sendBytesToTyrus(ctx, byteBuffer))
.forEach(byteBuf -> sendBytesToTyrus(ctx, byteBuf))
.onError(this::logError);
}

Expand Down