Support ALLOW_HALF_CLOSURE channel option on Unix domain socket. (#8932)
Motivation: Since DomainSocketChannel is a DuplexChannel, which be able to shutdown input or output individually on demands, but ALLOW_HALF_CLOSURE channel option has not been supported yet. I thought this could be a missing feature of Unix domain socket, so here the PR for it. Modifications: 1. Added allHalfClosure property both in EpollDomainSocketChannelConfig and KQueueDomainSocketChannelConfig, 2. Enabled isAllowHalfClosure method of native channel to support domain channel config, 3. Created EpollDomainSocketShutdownOutputByPeerTest and KQueueDomainSocketShutdownOutputByPeerTest to verify the change. Result: ALLOW_HALF_CLOSURE channel option can be set with DomainSocketChannel, and no more warning of Unknown channel option 'ALLOW_HALF_CLOSURE'.
This commit is contained in:
parent
c86f84944d
commit
238018e4ea
@ -0,0 +1,163 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2019 The Netty Project
|
||||||
|
*
|
||||||
|
* The Netty Project licenses this file to you under the Apache License,
|
||||||
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at:
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
* License for the specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
package io.netty.testsuite.transport.socket;
|
||||||
|
|
||||||
|
import io.netty.bootstrap.ServerBootstrap;
|
||||||
|
import io.netty.buffer.ByteBuf;
|
||||||
|
import io.netty.channel.Channel;
|
||||||
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
|
import io.netty.channel.ChannelOption;
|
||||||
|
import io.netty.channel.SimpleChannelInboundHandler;
|
||||||
|
import io.netty.channel.socket.ChannelInputShutdownEvent;
|
||||||
|
import io.netty.channel.socket.DuplexChannel;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.SocketAddress;
|
||||||
|
import java.util.concurrent.BlockingQueue;
|
||||||
|
import java.util.concurrent.CountDownLatch;
|
||||||
|
import java.util.concurrent.LinkedBlockingQueue;
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
public abstract class AbstractSocketShutdownOutputByPeerTest<Socket> extends AbstractServerSocketTest {
|
||||||
|
|
||||||
|
@Test(timeout = 30000)
|
||||||
|
public void testShutdownOutput() throws Throwable {
|
||||||
|
run();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testShutdownOutput(ServerBootstrap sb) throws Throwable {
|
||||||
|
TestHandler h = new TestHandler();
|
||||||
|
Socket s = newSocket();
|
||||||
|
Channel sc = null;
|
||||||
|
try {
|
||||||
|
sc = sb.childHandler(h).childOption(ChannelOption.ALLOW_HALF_CLOSURE, true).bind().sync().channel();
|
||||||
|
|
||||||
|
connect(s, sc.localAddress());
|
||||||
|
write(s, 1);
|
||||||
|
|
||||||
|
assertEquals(1, (int) h.queue.take());
|
||||||
|
|
||||||
|
assertTrue(h.ch.isOpen());
|
||||||
|
assertTrue(h.ch.isActive());
|
||||||
|
assertFalse(h.ch.isInputShutdown());
|
||||||
|
assertFalse(h.ch.isOutputShutdown());
|
||||||
|
|
||||||
|
shutdownOutput(s);
|
||||||
|
|
||||||
|
h.halfClosure.await();
|
||||||
|
|
||||||
|
assertTrue(h.ch.isOpen());
|
||||||
|
assertTrue(h.ch.isActive());
|
||||||
|
assertTrue(h.ch.isInputShutdown());
|
||||||
|
assertFalse(h.ch.isOutputShutdown());
|
||||||
|
|
||||||
|
while (h.closure.getCount() != 1 && h.halfClosureCount.intValue() != 1) {
|
||||||
|
Thread.sleep(100);
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
if (sc != null) {
|
||||||
|
sc.close();
|
||||||
|
}
|
||||||
|
close(s);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test(timeout = 30000)
|
||||||
|
public void testShutdownOutputWithoutOption() throws Throwable {
|
||||||
|
run();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testShutdownOutputWithoutOption(ServerBootstrap sb) throws Throwable {
|
||||||
|
TestHandler h = new TestHandler();
|
||||||
|
Socket s = newSocket();
|
||||||
|
Channel sc = null;
|
||||||
|
try {
|
||||||
|
sc = sb.childHandler(h).bind().sync().channel();
|
||||||
|
|
||||||
|
connect(s, sc.localAddress());
|
||||||
|
write(s, 1);
|
||||||
|
|
||||||
|
assertEquals(1, (int) h.queue.take());
|
||||||
|
|
||||||
|
assertTrue(h.ch.isOpen());
|
||||||
|
assertTrue(h.ch.isActive());
|
||||||
|
assertFalse(h.ch.isInputShutdown());
|
||||||
|
assertFalse(h.ch.isOutputShutdown());
|
||||||
|
|
||||||
|
shutdownOutput(s);
|
||||||
|
|
||||||
|
h.closure.await();
|
||||||
|
|
||||||
|
assertFalse(h.ch.isOpen());
|
||||||
|
assertFalse(h.ch.isActive());
|
||||||
|
assertTrue(h.ch.isInputShutdown());
|
||||||
|
assertTrue(h.ch.isOutputShutdown());
|
||||||
|
|
||||||
|
while (h.halfClosure.getCount() != 1 && h.halfClosureCount.intValue() != 0) {
|
||||||
|
Thread.sleep(100);
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
if (sc != null) {
|
||||||
|
sc.close();
|
||||||
|
}
|
||||||
|
close(s);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract void shutdownOutput(Socket s) throws IOException;
|
||||||
|
|
||||||
|
protected abstract void connect(Socket s, SocketAddress address) throws IOException;
|
||||||
|
|
||||||
|
protected abstract void close(Socket s) throws IOException;
|
||||||
|
|
||||||
|
protected abstract void write(Socket s, int data) throws IOException;
|
||||||
|
|
||||||
|
protected abstract Socket newSocket();
|
||||||
|
|
||||||
|
private static class TestHandler extends SimpleChannelInboundHandler<ByteBuf> {
|
||||||
|
volatile DuplexChannel ch;
|
||||||
|
final BlockingQueue<Byte> queue = new LinkedBlockingQueue<Byte>();
|
||||||
|
final CountDownLatch halfClosure = new CountDownLatch(1);
|
||||||
|
final CountDownLatch closure = new CountDownLatch(1);
|
||||||
|
final AtomicInteger halfClosureCount = new AtomicInteger();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void channelActive(ChannelHandlerContext ctx) throws Exception {
|
||||||
|
ch = (DuplexChannel) ctx.channel();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void channelInactive(ChannelHandlerContext ctx) throws Exception {
|
||||||
|
closure.countDown();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
|
||||||
|
queue.offer(msg.readByte());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
|
||||||
|
if (evt instanceof ChannelInputShutdownEvent) {
|
||||||
|
halfClosureCount.incrementAndGet();
|
||||||
|
halfClosure.countDown();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -15,138 +15,37 @@
|
|||||||
*/
|
*/
|
||||||
package io.netty.testsuite.transport.socket;
|
package io.netty.testsuite.transport.socket;
|
||||||
|
|
||||||
import io.netty.bootstrap.ServerBootstrap;
|
|
||||||
import io.netty.buffer.ByteBuf;
|
|
||||||
import io.netty.channel.Channel;
|
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
|
||||||
import io.netty.channel.ChannelOption;
|
|
||||||
import io.netty.channel.SimpleChannelInboundHandler;
|
|
||||||
import io.netty.util.internal.SocketUtils;
|
import io.netty.util.internal.SocketUtils;
|
||||||
import io.netty.channel.socket.ChannelInputShutdownEvent;
|
|
||||||
import io.netty.channel.socket.SocketChannel;
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
import java.net.Socket;
|
import java.net.Socket;
|
||||||
import java.util.concurrent.BlockingQueue;
|
import java.net.SocketAddress;
|
||||||
import java.util.concurrent.CountDownLatch;
|
|
||||||
import java.util.concurrent.LinkedBlockingQueue;
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import static org.junit.Assert.*;
|
public class SocketShutdownOutputByPeerTest extends AbstractSocketShutdownOutputByPeerTest<Socket> {
|
||||||
|
|
||||||
public class SocketShutdownOutputByPeerTest extends AbstractServerSocketTest {
|
|
||||||
|
|
||||||
@Test(timeout = 30000)
|
|
||||||
public void testShutdownOutput() throws Throwable {
|
|
||||||
run();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testShutdownOutput(ServerBootstrap sb) throws Throwable {
|
|
||||||
TestHandler h = new TestHandler();
|
|
||||||
Socket s = new Socket();
|
|
||||||
Channel sc = null;
|
|
||||||
try {
|
|
||||||
sc = sb.childHandler(h).childOption(ChannelOption.ALLOW_HALF_CLOSURE, true).bind().sync().channel();
|
|
||||||
|
|
||||||
SocketUtils.connect(s, sc.localAddress(), 10000);
|
|
||||||
s.getOutputStream().write(1);
|
|
||||||
|
|
||||||
assertEquals(1, (int) h.queue.take());
|
|
||||||
|
|
||||||
assertTrue(h.ch.isOpen());
|
|
||||||
assertTrue(h.ch.isActive());
|
|
||||||
assertFalse(h.ch.isInputShutdown());
|
|
||||||
assertFalse(h.ch.isOutputShutdown());
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void shutdownOutput(Socket s) throws IOException {
|
||||||
s.shutdownOutput();
|
s.shutdownOutput();
|
||||||
|
|
||||||
h.halfClosure.await();
|
|
||||||
|
|
||||||
assertTrue(h.ch.isOpen());
|
|
||||||
assertTrue(h.ch.isActive());
|
|
||||||
assertTrue(h.ch.isInputShutdown());
|
|
||||||
assertFalse(h.ch.isOutputShutdown());
|
|
||||||
assertEquals(1, h.closure.getCount());
|
|
||||||
Thread.sleep(100);
|
|
||||||
assertEquals(1, h.halfClosureCount.intValue());
|
|
||||||
} finally {
|
|
||||||
if (sc != null) {
|
|
||||||
sc.close();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void connect(Socket s, SocketAddress address) throws IOException {
|
||||||
|
SocketUtils.connect(s, address, 10000);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void close(Socket s) throws IOException {
|
||||||
s.close();
|
s.close();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Test(timeout = 30000)
|
|
||||||
public void testShutdownOutputWithoutOption() throws Throwable {
|
|
||||||
run();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testShutdownOutputWithoutOption(ServerBootstrap sb) throws Throwable {
|
|
||||||
TestHandler h = new TestHandler();
|
|
||||||
Socket s = new Socket();
|
|
||||||
Channel sc = null;
|
|
||||||
try {
|
|
||||||
sc = sb.childHandler(h).bind().sync().channel();
|
|
||||||
|
|
||||||
SocketUtils.connect(s, sc.localAddress(), 10000);
|
|
||||||
s.getOutputStream().write(1);
|
|
||||||
|
|
||||||
assertEquals(1, (int) h.queue.take());
|
|
||||||
|
|
||||||
assertTrue(h.ch.isOpen());
|
|
||||||
assertTrue(h.ch.isActive());
|
|
||||||
assertFalse(h.ch.isInputShutdown());
|
|
||||||
assertFalse(h.ch.isOutputShutdown());
|
|
||||||
|
|
||||||
s.shutdownOutput();
|
|
||||||
|
|
||||||
h.closure.await();
|
|
||||||
|
|
||||||
assertFalse(h.ch.isOpen());
|
|
||||||
assertFalse(h.ch.isActive());
|
|
||||||
assertTrue(h.ch.isInputShutdown());
|
|
||||||
assertTrue(h.ch.isOutputShutdown());
|
|
||||||
|
|
||||||
assertEquals(1, h.halfClosure.getCount());
|
|
||||||
Thread.sleep(100);
|
|
||||||
assertEquals(0, h.halfClosureCount.intValue());
|
|
||||||
} finally {
|
|
||||||
if (sc != null) {
|
|
||||||
sc.close();
|
|
||||||
}
|
|
||||||
s.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class TestHandler extends SimpleChannelInboundHandler<ByteBuf> {
|
|
||||||
volatile SocketChannel ch;
|
|
||||||
final BlockingQueue<Byte> queue = new LinkedBlockingQueue<>();
|
|
||||||
final CountDownLatch halfClosure = new CountDownLatch(1);
|
|
||||||
final CountDownLatch closure = new CountDownLatch(1);
|
|
||||||
final AtomicInteger halfClosureCount = new AtomicInteger();
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelActive(ChannelHandlerContext ctx) throws Exception {
|
protected void write(Socket s, int data) throws IOException {
|
||||||
ch = (SocketChannel) ctx.channel();
|
s.getOutputStream().write(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelInactive(ChannelHandlerContext ctx) throws Exception {
|
protected Socket newSocket() {
|
||||||
closure.countDown();
|
return new Socket();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
|
|
||||||
queue.offer(msg.readByte());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
|
|
||||||
if (evt instanceof ChannelInputShutdownEvent) {
|
|
||||||
halfClosureCount.incrementAndGet();
|
|
||||||
halfClosure.countDown();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -243,6 +243,9 @@ abstract class AbstractEpollChannel extends AbstractChannel implements UnixChann
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isAllowHalfClosure(ChannelConfig config) {
|
private static boolean isAllowHalfClosure(ChannelConfig config) {
|
||||||
|
if (config instanceof EpollDomainSocketChannelConfig) {
|
||||||
|
return ((EpollDomainSocketChannelConfig) config).isAllowHalfClosure();
|
||||||
|
}
|
||||||
return config instanceof SocketChannelConfig &&
|
return config instanceof SocketChannelConfig &&
|
||||||
((SocketChannelConfig) config).isAllowHalfClosure();
|
((SocketChannelConfig) config).isAllowHalfClosure();
|
||||||
}
|
}
|
||||||
|
@ -22,14 +22,19 @@ import io.netty.channel.ChannelOption;
|
|||||||
import io.netty.channel.MessageSizeEstimator;
|
import io.netty.channel.MessageSizeEstimator;
|
||||||
import io.netty.channel.RecvByteBufAllocator;
|
import io.netty.channel.RecvByteBufAllocator;
|
||||||
import io.netty.channel.WriteBufferWaterMark;
|
import io.netty.channel.WriteBufferWaterMark;
|
||||||
|
import io.netty.channel.socket.SocketChannelConfig;
|
||||||
import io.netty.channel.unix.DomainSocketChannelConfig;
|
import io.netty.channel.unix.DomainSocketChannelConfig;
|
||||||
import io.netty.channel.unix.DomainSocketReadMode;
|
import io.netty.channel.unix.DomainSocketReadMode;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import static io.netty.channel.ChannelOption.*;
|
||||||
|
import static io.netty.channel.unix.UnixChannelOption.*;
|
||||||
|
|
||||||
public final class EpollDomainSocketChannelConfig extends EpollChannelConfig
|
public final class EpollDomainSocketChannelConfig extends EpollChannelConfig
|
||||||
implements DomainSocketChannelConfig {
|
implements DomainSocketChannelConfig {
|
||||||
private volatile DomainSocketReadMode mode = DomainSocketReadMode.BYTES;
|
private volatile DomainSocketReadMode mode = DomainSocketReadMode.BYTES;
|
||||||
|
private volatile boolean allowHalfClosure;
|
||||||
|
|
||||||
EpollDomainSocketChannelConfig(AbstractEpollChannel channel) {
|
EpollDomainSocketChannelConfig(AbstractEpollChannel channel) {
|
||||||
super(channel);
|
super(channel);
|
||||||
@ -37,15 +42,18 @@ public final class EpollDomainSocketChannelConfig extends EpollChannelConfig
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Map<ChannelOption<?>, Object> getOptions() {
|
public Map<ChannelOption<?>, Object> getOptions() {
|
||||||
return getOptions(super.getOptions(), EpollChannelOption.DOMAIN_SOCKET_READ_MODE);
|
return getOptions(super.getOptions(), DOMAIN_SOCKET_READ_MODE, ALLOW_HALF_CLOSURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
public <T> T getOption(ChannelOption<T> option) {
|
public <T> T getOption(ChannelOption<T> option) {
|
||||||
if (option == EpollChannelOption.DOMAIN_SOCKET_READ_MODE) {
|
if (option == DOMAIN_SOCKET_READ_MODE) {
|
||||||
return (T) getReadMode();
|
return (T) getReadMode();
|
||||||
}
|
}
|
||||||
|
if (option == ALLOW_HALF_CLOSURE) {
|
||||||
|
return (T) Boolean.valueOf(isAllowHalfClosure());
|
||||||
|
}
|
||||||
return super.getOption(option);
|
return super.getOption(option);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -53,8 +61,10 @@ public final class EpollDomainSocketChannelConfig extends EpollChannelConfig
|
|||||||
public <T> boolean setOption(ChannelOption<T> option, T value) {
|
public <T> boolean setOption(ChannelOption<T> option, T value) {
|
||||||
validate(option, value);
|
validate(option, value);
|
||||||
|
|
||||||
if (option == EpollChannelOption.DOMAIN_SOCKET_READ_MODE) {
|
if (option == DOMAIN_SOCKET_READ_MODE) {
|
||||||
setReadMode((DomainSocketReadMode) value);
|
setReadMode((DomainSocketReadMode) value);
|
||||||
|
} else if (option == ALLOW_HALF_CLOSURE) {
|
||||||
|
setAllowHalfClosure((Boolean) value);
|
||||||
} else {
|
} else {
|
||||||
return super.setOption(option, value);
|
return super.setOption(option, value);
|
||||||
}
|
}
|
||||||
@ -148,4 +158,19 @@ public final class EpollDomainSocketChannelConfig extends EpollChannelConfig
|
|||||||
public DomainSocketReadMode getReadMode() {
|
public DomainSocketReadMode getReadMode() {
|
||||||
return mode;
|
return mode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @see SocketChannelConfig#isAllowHalfClosure()
|
||||||
|
*/
|
||||||
|
public boolean isAllowHalfClosure() {
|
||||||
|
return allowHalfClosure;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @see SocketChannelConfig#setAllowHalfClosure(boolean)
|
||||||
|
*/
|
||||||
|
public EpollDomainSocketChannelConfig setAllowHalfClosure(boolean allowHalfClosure) {
|
||||||
|
this.allowHalfClosure = allowHalfClosure;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,69 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2019 The Netty Project
|
||||||
|
*
|
||||||
|
* The Netty Project licenses this file to you under the Apache License,
|
||||||
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at:
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
* License for the specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package io.netty.channel.epoll;
|
||||||
|
|
||||||
|
import io.netty.bootstrap.ServerBootstrap;
|
||||||
|
import io.netty.channel.unix.Buffer;
|
||||||
|
import io.netty.testsuite.transport.TestsuitePermutation.BootstrapFactory;
|
||||||
|
import io.netty.testsuite.transport.socket.AbstractSocketShutdownOutputByPeerTest;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.SocketAddress;
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class EpollDomainSocketShutdownOutputByPeerTest extends AbstractSocketShutdownOutputByPeerTest<LinuxSocket> {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected List<BootstrapFactory<ServerBootstrap>> newFactories() {
|
||||||
|
return EpollSocketTestPermutation.INSTANCE.serverDomainSocket();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected SocketAddress newSocketAddress() {
|
||||||
|
return EpollSocketTestPermutation.newSocketAddress();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void shutdownOutput(LinuxSocket s) throws IOException {
|
||||||
|
s.shutdown(false, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void connect(LinuxSocket s, SocketAddress address) throws IOException {
|
||||||
|
s.connect(address);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void close(LinuxSocket s) throws IOException {
|
||||||
|
s.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void write(LinuxSocket s, int data) throws IOException {
|
||||||
|
final ByteBuffer buf = Buffer.allocateDirectWithNativeOrder(4);
|
||||||
|
buf.putInt(data);
|
||||||
|
buf.flip();
|
||||||
|
s.write(buf, buf.position(), buf.limit());
|
||||||
|
Buffer.free(buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected LinuxSocket newSocket() {
|
||||||
|
return LinuxSocket.newSocketDomain();
|
||||||
|
}
|
||||||
|
}
|
@ -268,7 +268,7 @@ abstract class AbstractKQueueChannel extends AbstractChannel implements UnixChan
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
final ByteBuffer nioBuf = buf.nioBufferCount() == 1 ?
|
final ByteBuffer nioBuf = buf.nioBufferCount() == 1?
|
||||||
buf.internalNioBuffer(buf.readerIndex(), buf.readableBytes()) : buf.nioBuffer();
|
buf.internalNioBuffer(buf.readerIndex(), buf.readableBytes()) : buf.nioBuffer();
|
||||||
int localFlushedAmount = socket.write(nioBuf, nioBuf.position(), nioBuf.limit());
|
int localFlushedAmount = socket.write(nioBuf, nioBuf.position(), nioBuf.limit());
|
||||||
if (localFlushedAmount > 0) {
|
if (localFlushedAmount > 0) {
|
||||||
@ -285,6 +285,10 @@ abstract class AbstractKQueueChannel extends AbstractChannel implements UnixChan
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isAllowHalfClosure(ChannelConfig config) {
|
private static boolean isAllowHalfClosure(ChannelConfig config) {
|
||||||
|
if (config instanceof KQueueDomainSocketChannelConfig) {
|
||||||
|
return ((KQueueDomainSocketChannelConfig) config).isAllowHalfClosure();
|
||||||
|
}
|
||||||
|
|
||||||
return config instanceof SocketChannelConfig &&
|
return config instanceof SocketChannelConfig &&
|
||||||
((SocketChannelConfig) config).isAllowHalfClosure();
|
((SocketChannelConfig) config).isAllowHalfClosure();
|
||||||
}
|
}
|
||||||
@ -673,7 +677,7 @@ abstract class AbstractKQueueChannel extends AbstractChannel implements UnixChan
|
|||||||
|
|
||||||
boolean connected = doConnect0(remoteAddress);
|
boolean connected = doConnect0(remoteAddress);
|
||||||
if (connected) {
|
if (connected) {
|
||||||
remote = remoteSocketAddr == null ?
|
remote = remoteSocketAddr == null?
|
||||||
remoteAddress : computeRemoteAddr(remoteSocketAddr, socket.remoteAddress());
|
remoteAddress : computeRemoteAddr(remoteSocketAddr, socket.remoteAddress());
|
||||||
}
|
}
|
||||||
// We always need to set the localAddress even if not connected yet as the bind already took place.
|
// We always need to set the localAddress even if not connected yet as the bind already took place.
|
||||||
|
@ -20,6 +20,7 @@ import io.netty.channel.ChannelOption;
|
|||||||
import io.netty.channel.MessageSizeEstimator;
|
import io.netty.channel.MessageSizeEstimator;
|
||||||
import io.netty.channel.RecvByteBufAllocator;
|
import io.netty.channel.RecvByteBufAllocator;
|
||||||
import io.netty.channel.WriteBufferWaterMark;
|
import io.netty.channel.WriteBufferWaterMark;
|
||||||
|
import io.netty.channel.socket.SocketChannelConfig;
|
||||||
import io.netty.channel.unix.DomainSocketChannelConfig;
|
import io.netty.channel.unix.DomainSocketChannelConfig;
|
||||||
import io.netty.channel.unix.DomainSocketReadMode;
|
import io.netty.channel.unix.DomainSocketReadMode;
|
||||||
import io.netty.util.internal.UnstableApi;
|
import io.netty.util.internal.UnstableApi;
|
||||||
@ -28,10 +29,12 @@ import java.util.Map;
|
|||||||
|
|
||||||
import static io.netty.channel.unix.UnixChannelOption.DOMAIN_SOCKET_READ_MODE;
|
import static io.netty.channel.unix.UnixChannelOption.DOMAIN_SOCKET_READ_MODE;
|
||||||
import static java.util.Objects.requireNonNull;
|
import static java.util.Objects.requireNonNull;
|
||||||
|
import static io.netty.channel.ChannelOption.ALLOW_HALF_CLOSURE;
|
||||||
|
|
||||||
@UnstableApi
|
@UnstableApi
|
||||||
public final class KQueueDomainSocketChannelConfig extends KQueueChannelConfig implements DomainSocketChannelConfig {
|
public final class KQueueDomainSocketChannelConfig extends KQueueChannelConfig implements DomainSocketChannelConfig {
|
||||||
private volatile DomainSocketReadMode mode = DomainSocketReadMode.BYTES;
|
private volatile DomainSocketReadMode mode = DomainSocketReadMode.BYTES;
|
||||||
|
private volatile boolean allowHalfClosure;
|
||||||
|
|
||||||
KQueueDomainSocketChannelConfig(AbstractKQueueChannel channel) {
|
KQueueDomainSocketChannelConfig(AbstractKQueueChannel channel) {
|
||||||
super(channel);
|
super(channel);
|
||||||
@ -39,7 +42,7 @@ public final class KQueueDomainSocketChannelConfig extends KQueueChannelConfig i
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Map<ChannelOption<?>, Object> getOptions() {
|
public Map<ChannelOption<?>, Object> getOptions() {
|
||||||
return getOptions(super.getOptions(), DOMAIN_SOCKET_READ_MODE);
|
return getOptions(super.getOptions(), DOMAIN_SOCKET_READ_MODE, ALLOW_HALF_CLOSURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@ -48,6 +51,9 @@ public final class KQueueDomainSocketChannelConfig extends KQueueChannelConfig i
|
|||||||
if (option == DOMAIN_SOCKET_READ_MODE) {
|
if (option == DOMAIN_SOCKET_READ_MODE) {
|
||||||
return (T) getReadMode();
|
return (T) getReadMode();
|
||||||
}
|
}
|
||||||
|
if (option == ALLOW_HALF_CLOSURE) {
|
||||||
|
return (T) Boolean.valueOf(isAllowHalfClosure());
|
||||||
|
}
|
||||||
return super.getOption(option);
|
return super.getOption(option);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -57,6 +63,8 @@ public final class KQueueDomainSocketChannelConfig extends KQueueChannelConfig i
|
|||||||
|
|
||||||
if (option == DOMAIN_SOCKET_READ_MODE) {
|
if (option == DOMAIN_SOCKET_READ_MODE) {
|
||||||
setReadMode((DomainSocketReadMode) value);
|
setReadMode((DomainSocketReadMode) value);
|
||||||
|
} else if (option == ALLOW_HALF_CLOSURE) {
|
||||||
|
setAllowHalfClosure((Boolean) value);
|
||||||
} else {
|
} else {
|
||||||
return super.setOption(option, value);
|
return super.setOption(option, value);
|
||||||
}
|
}
|
||||||
@ -150,4 +158,19 @@ public final class KQueueDomainSocketChannelConfig extends KQueueChannelConfig i
|
|||||||
public DomainSocketReadMode getReadMode() {
|
public DomainSocketReadMode getReadMode() {
|
||||||
return mode;
|
return mode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @see SocketChannelConfig#isAllowHalfClosure()
|
||||||
|
*/
|
||||||
|
public boolean isAllowHalfClosure() {
|
||||||
|
return allowHalfClosure;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @see SocketChannelConfig#setAllowHalfClosure(boolean)
|
||||||
|
*/
|
||||||
|
public KQueueDomainSocketChannelConfig setAllowHalfClosure(boolean allowHalfClosure) {
|
||||||
|
this.allowHalfClosure = allowHalfClosure;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,68 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2019 The Netty Project
|
||||||
|
*
|
||||||
|
* The Netty Project licenses this file to you under the Apache License,
|
||||||
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at:
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
* License for the specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
package io.netty.channel.kqueue;
|
||||||
|
|
||||||
|
import io.netty.bootstrap.ServerBootstrap;
|
||||||
|
import io.netty.channel.unix.Buffer;
|
||||||
|
import io.netty.testsuite.transport.TestsuitePermutation.BootstrapFactory;
|
||||||
|
import io.netty.testsuite.transport.socket.AbstractSocketShutdownOutputByPeerTest;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.SocketAddress;
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class KQueueDomainSocketShutdownOutputByPeerTest extends AbstractSocketShutdownOutputByPeerTest<BsdSocket> {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected List<BootstrapFactory<ServerBootstrap>> newFactories() {
|
||||||
|
return KQueueSocketTestPermutation.INSTANCE.serverDomainSocket();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected SocketAddress newSocketAddress() {
|
||||||
|
return KQueueSocketTestPermutation.newSocketAddress();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void shutdownOutput(BsdSocket s) throws IOException {
|
||||||
|
s.shutdown(false, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void connect(BsdSocket s, SocketAddress address) throws IOException {
|
||||||
|
s.connect(address);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void close(BsdSocket s) throws IOException {
|
||||||
|
s.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void write(BsdSocket s, int data) throws IOException {
|
||||||
|
final ByteBuffer buf = Buffer.allocateDirectWithNativeOrder(4);
|
||||||
|
buf.putInt(data);
|
||||||
|
buf.flip();
|
||||||
|
s.write(buf, buf.position(), buf.limit());
|
||||||
|
Buffer.free(buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected BsdSocket newSocket() {
|
||||||
|
return BsdSocket.newSocketDomain();
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user