You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2018/01/09 23:23:35 UTC
[GitHub] rdhabalia closed pull request #1045: Revert "Enable usage of KQueue in MacOS (#1036)"
rdhabalia closed pull request #1045: Revert "Enable usage of KQueue in MacOS (#1036)"
URL: https://github.com/apache/incubator-pulsar/pull/1045
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/EventLoopUtil.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/EventLoopUtil.java
index 4c3af718d..addacbebd 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/EventLoopUtil.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/netty/EventLoopUtil.java
@@ -29,11 +29,6 @@
import io.netty.channel.epoll.EpollMode;
import io.netty.channel.epoll.EpollServerSocketChannel;
import io.netty.channel.epoll.EpollSocketChannel;
-import io.netty.channel.kqueue.KQueue;
-import io.netty.channel.kqueue.KQueueDatagramChannel;
-import io.netty.channel.kqueue.KQueueEventLoopGroup;
-import io.netty.channel.kqueue.KQueueServerSocketChannel;
-import io.netty.channel.kqueue.KQueueSocketChannel;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.DatagramChannel;
import io.netty.channel.socket.ServerSocketChannel;
@@ -50,8 +45,6 @@
public static EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
if (Epoll.isAvailable()) {
return new EpollEventLoopGroup(nThreads, threadFactory);
- } else if (KQueue.isAvailable()) {
- return new KQueueEventLoopGroup(nThreads, threadFactory);
} else {
// Fallback to NIO
return new NioEventLoopGroup(nThreads, threadFactory);
@@ -67,8 +60,6 @@ public static EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threa
public static Class<? extends SocketChannel> getClientSocketChannelClass(EventLoopGroup eventLoopGroup) {
if (eventLoopGroup instanceof EpollEventLoopGroup) {
return EpollSocketChannel.class;
- } else if (eventLoopGroup instanceof KQueueEventLoopGroup) {
- return KQueueSocketChannel.class;
} else {
return NioSocketChannel.class;
}
@@ -77,8 +68,6 @@ public static EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threa
public static Class<? extends ServerSocketChannel> getServerSocketChannelClass(EventLoopGroup eventLoopGroup) {
if (eventLoopGroup instanceof EpollEventLoopGroup) {
return EpollServerSocketChannel.class;
- } else if (eventLoopGroup instanceof KQueueEventLoopGroup) {
- return KQueueServerSocketChannel.class;
} else {
return NioServerSocketChannel.class;
}
@@ -87,8 +76,6 @@ public static EventLoopGroup newEventLoopGroup(int nThreads, ThreadFactory threa
public static Class<? extends DatagramChannel> getDatagramChannelClass(EventLoopGroup eventLoopGroup) {
if (eventLoopGroup instanceof EpollEventLoopGroup) {
return EpollDatagramChannel.class;
- } else if (eventLoopGroup instanceof KQueueEventLoopGroup) {
- return KQueueDatagramChannel.class;
} else {
return NioDatagramChannel.class;
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services