andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correctly close ring buffer in tests so we dont leak memory

Browse Source
This commit is contained in:
Norman Maurer 2020-08-27 11:29:23 +02:00
parent 3cdb1d60ae
commit 11e169e17a
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
transport-native-io_uring/src/test/java/io/netty/channel/uring/NativeTest.java
View File

@ -16,10 +16,9 @@
package io.netty.channel.uring; package io.netty.channel.uring;
import io.netty.channel.unix.FileDescriptor; import io.netty.channel.unix.FileDescriptor;
import io.netty.channel.unix.Socket;
import org.junit.Test; import org.junit.Test;
import java.io.File; import java.io.IOException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.ByteBufAllocator;
@ -28,14 +27,11 @@ import io.netty.buffer.UnpooledByteBufAllocator;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import org.junit.experimental.theories.suppliers.TestedOn;
public class NativeTest { public class NativeTest {
@Test @Test
public void canWriteFile() { public void canWriteFile() {
final long eventId = 1;
ByteBufAllocator allocator = new UnpooledByteBufAllocator(true); ByteBufAllocator allocator = new UnpooledByteBufAllocator(true);
final ByteBuf writeEventByteBuf = allocator.directBuffer(100); final ByteBuf writeEventByteBuf = allocator.directBuffer(100);
final String inputString = "Hello World!"; final String inputString = "Hello World!";
@ -84,10 +80,12 @@ public class NativeTest {
assertArrayEquals(inputString.getBytes(), dataRead); assertArrayEquals(inputString.getBytes(), dataRead);
readEventByteBuf.release(); readEventByteBuf.release();
ringBuffer.close();
} }
@Test @Test
public void timeoutTest() { public void timeoutTest() throws InterruptedException {
RingBuffer ringBuffer = Native.createRingBuffer(32); RingBuffer ringBuffer = Native.createRingBuffer(32);
IOUringSubmissionQueue submissionQueue = ringBuffer.getIoUringSubmissionQueue(); IOUringSubmissionQueue submissionQueue = ringBuffer.getIoUringSubmissionQueue();
@ -119,11 +117,14 @@ public class NativeTest {
submissionQueue.addTimeout(0); submissionQueue.addTimeout(0);
submissionQueue.submit(); submissionQueue.submit();
thread.join();
ringBuffer.close();
} }
//Todo clean //Todo clean
@Test @Test
public void eventfdTest() { public void eventfdTest() throws IOException {
RingBuffer ringBuffer = Native.createRingBuffer(32); RingBuffer ringBuffer = Native.createRingBuffer(32);
IOUringSubmissionQueue submissionQueue = ringBuffer.getIoUringSubmissionQueue(); IOUringSubmissionQueue submissionQueue = ringBuffer.getIoUringSubmissionQueue();
final IOUringCompletionQueue completionQueue = ringBuffer.getIoUringCompletionQueue(); final IOUringCompletionQueue completionQueue = ringBuffer.getIoUringCompletionQueue();
@ -151,6 +152,11 @@ public class NativeTest {
return true; return true;
} }
})); }));
try {
eventFd.close();
} finally {
ringBuffer.close();
}
} }
//Todo clean //Todo clean
@ -204,7 +210,7 @@ public class NativeTest {
} }
@Test @Test
public void ioUringPollRemoveTest() throws InterruptedException { public void ioUringPollRemoveTest() throws Exception {
RingBuffer ringBuffer = Native.createRingBuffer(32); RingBuffer ringBuffer = Native.createRingBuffer(32);
IOUringSubmissionQueue submissionQueue = ringBuffer.getIoUringSubmissionQueue(); IOUringSubmissionQueue submissionQueue = ringBuffer.getIoUringSubmissionQueue();
final IOUringCompletionQueue completionQueue = ringBuffer.getIoUringCompletionQueue(); final IOUringCompletionQueue completionQueue = ringBuffer.getIoUringCompletionQueue();
@ -243,5 +249,10 @@ public class NativeTest {
waitingCqe.start(); waitingCqe.start();
waitingCqe.join(); waitingCqe.join();
try {
eventFd.close();
} finally {
ringBuffer.close();
}
} }
} }