Update to Netty 4.1.50.

The substitution for `io.netty.channel.nio.NioEventLoop` isn't enough anymore to not use the JC tools queues. Instead, we allow reflective field access in those.
michael-simons · Jun 25, 2020 · 5129a63 · 5129a63
1 parent d2e63b1
commit 5129a63
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-handler</artifactId>
-			<version>4.1.45.Final</version>
+			<version>4.1.50.Final</version>
 		</dependency>
 
 		<dependency>

diff --git a/src/main/java/ac/simons/netty/example/svm/NettySubstitutions.java b/src/main/java/ac/simons/netty/example/svm/NettySubstitutions.java
@@ -3,9 +3,6 @@
 import io.netty.util.internal.logging.InternalLoggerFactory;
 import io.netty.util.internal.logging.JdkLoggerFactory;
 
-import java.util.Queue;
-import java.util.concurrent.LinkedBlockingDeque;
-
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 
@@ -21,17 +18,6 @@ private static InternalLoggerFactory newDefaultFactory(String name) {
 	}
 }
 
-
-@TargetClass(className = "io.netty.channel.nio.NioEventLoop")
-final class Target_io_netty_channel_nio_NioEventLoop {
-
-    @Substitute
-    private static Queue<Runnable> newTaskQueue0(int maxPendingTasks) {
-        return new LinkedBlockingDeque<>();
-    }
-}
-
-
 class NettySubstitutions {
 
 }
diff --git a/.../native-image/eu.michael-simons/native-netty-timeserver-and-client/reflection-config.json b/.../native-image/eu.michael-simons/native-netty-timeserver-and-client/reflection-config.json
@@ -18,5 +18,41 @@
   {
     "name" : "io.netty.util.ReferenceCountUtil",
     "allDeclaredMethods" : true
+  },
+  {
+    "name" : "io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField",
+    "fields": [
+      {"name": "producerIndex", "allowUnsafeAccess": true}
+    ]
+  },
+  {
+    "name" : "io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField",
+    "fields": [
+      {"name": "producerLimit", "allowUnsafeAccess": true}
+    ]
+  },
+  {
+    "name" : "io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField",
+    "fields": [
+      {"name": "consumerIndex", "allowUnsafeAccess": true}
+    ]
+  },
+  {
+    "name" : "io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueProducerFields",
+    "fields": [
+      {"name": "producerIndex", "allowUnsafeAccess": true}
+    ]
+  },
+  {
+    "name" : "io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields",
+    "fields": [
+      {"name": "producerLimit", "allowUnsafeAccess": true}
+    ]
+  },
+  {
+    "name" : "io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueConsumerFields",
+    "fields": [
+      {"name": "consumerIndex", "allowUnsafeAccess": true}
+    ]
   }
 ]