Nits

Stefania Alborghetti · Stefania Alborghetti · commit 4e3dad412212 · 2017-09-07T12:30:31.000+08:00
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/AIOContext.java b/transport-native-epoll/src/main/java/io/netty/channel/epoll/AIOContext.java
@@ -34,7 +34,7 @@ public class AIOContext {
     private final long address;
     private long nextId;
     private long outstanding;
-    private long maxOutstanding;
+    private final long maxOutstanding;
     private final Map<Long, IORequest> outstandingRequests;
     private final ArrayDeque<IORequest> pendingRequests;
     private volatile boolean destroyed;
@@ -70,7 +70,8 @@ public <A> void read(final AIOEpollFileChannel file, final ByteBuffer dst, final
         assert !destroyed;
         assert dst.isDirect();
         assert dst.position() == 0;
-        assert file.epollEventLoop.aioContext == this;
+
+        file.verify(this);
 
         int length = (dst.limit() & 511) == 0 ? dst.limit() : ((dst.limit() + 511) & ~511);
         if (dst.capacity() < length) {
@@ -88,7 +89,7 @@ public <A> void read(final AIOEpollFileChannel file, final ByteBuffer dst, final
         IORequest<A> request = new IORequest<A>(file, dst, position, length, handler, attachment);
 
         try {
-            // Avoid sending overflowing the aio context queue (EGAIN)
+            // Avoid sending overflowing the aio context queue (EAGAIN)
             // instead buffer locally
             if (outstanding + 1 <= maxOutstanding) {
                 long id = Native.submitAIORead(this, file.getEventFd(), file.getFd(), position, length, dst);
@@ -117,7 +118,8 @@ public <A> void read(final AIOEpollFileChannel file, final ByteBuffer dst, final
 
     public void processReady(AIOEpollFileChannel file) {
         assert !destroyed;
-        assert file.epollEventLoop.aioContext == this;
+        file.verify(this);
+
         IORequest request = null;
         try {
             long numReady = Native.eventFdRead(file.getEventFd());
@@ -156,7 +158,7 @@ public void processReady(AIOEpollFileChannel file) {
                 // Push any pending requests if we have room
                 try {
                     if (outstanding + 1 <= maxOutstanding && (req = pendingRequests.poll()) != null) {
-                        assert req.file.epollEventLoop.aioContext == this;
+                        req.file.verify(this);
                         long nextId = Native.submitAIORead(this, req.file.getEventFd(), req.file.getFd(),
                                                            req.position, req.length, req.buffer);
                         IORequest r = outstandingRequests.putIfAbsent(nextId, req);
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/AIOEpollFileChannel.java b/transport-native-epoll/src/main/java/io/netty/channel/epoll/AIOEpollFileChannel.java
@@ -30,7 +30,6 @@
 import io.netty.channel.unix.FileDescriptor;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
-import org.jctools.queues.SpscGrowableArrayQueue;
 
 
 public class AIOEpollFileChannel extends AsynchronousFileChannel {
@@ -39,7 +38,7 @@ public class AIOEpollFileChannel extends AsynchronousFileChannel {
     private final File fileObject;
     private final FileDescriptor file;
     private final FileDescriptor eventFd;
-    final EpollEventLoop epollEventLoop;
+    private final EpollEventLoop epollEventLoop;
     private final EventFileChannel nettyChannel;
     private final boolean isDirect;
 
@@ -72,6 +71,15 @@ public void run() {
         }
     }
 
+    /**
+     * Called by {@link AIOContext} to verify it has received a file with the same context as itself.
+     *
+     * @param context - the context calling this method
+     */
+    void verify(AIOContext context) {
+        assert epollEventLoop.aioContext == context : "Wrong AIO context tried to access file channel";
+    }
+
     public int getEventFd() {
         return eventFd.intValue();
     }
diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/LibAIOTest.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/LibAIOTest.java
@@ -144,23 +144,23 @@ public void run() {
                     int idx = 0;
                     try {
                         final EpollEventLoop loop = loops[tid % 8];
+                        final int numIterations = 1024;
 
                         AsynchronousFileChannel fc = new AIOEpollFileChannel(file, loop, FileDescriptor.O_RDONLY |
                                                                              FileDescriptor.O_DIRECT);
                         List<ImmutablePair<ByteBuffer, Future<Integer>>> futures =
-                            new ArrayList<ImmutablePair<ByteBuffer, Future<Integer>>>();
+                            new ArrayList<ImmutablePair<ByteBuffer, Future<Integer>>>(numIterations);
 
-                        for (int i = 0; i < 1024; i++) {
+                        for (int i = 0; i < numIterations; i++) {
                             //System.err.println(loop.threadProperties().name());
                             ByteBuffer buf = allocateAlignedByteBuffer(LEN, 512);
 
-                            buf.clear();
                             futures.add(new ImmutablePair<ByteBuffer,
                                                          Future<Integer>>(buf, fc.read(buf,
                                                                                        value.length() * (i % 1024))));
                         }
 
-                        for (int i = 0; i < 1024; i++) {
+                        for (int i = 0; i < numIterations; i++) {
                             int len = futures.get(i).getRight().get();
                             ByteBuffer buf = futures.get(i).getLeft();
                             buf.flip();
