feat: nio key set optimization

otavia-projects · Oct 21, 2024 · 3c68e23 · 3c68e23
1 parent 5f6f878
commit 3c68e23
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 29 deletions.
diff --git a/core/src/cc/otavia/core/transport/nio/channel/NioUnsafeSocketChannel.scala b/core/src/cc/otavia/core/transport/nio/channel/NioUnsafeSocketChannel.scala
@@ -31,7 +31,7 @@ import java.nio.channels.{SelectionKey, SocketChannel}
 import scala.collection.mutable
 import scala.language.unsafeNulls
 
-class NioUnsafeSocketChannel(channel: AbstractChannel, ch: SocketChannel, readInterestOp: Int)
+final class NioUnsafeSocketChannel(channel: AbstractChannel, ch: SocketChannel, readInterestOp: Int)
     extends AbstractNioUnsafeChannel[SocketChannel](channel, ch, readInterestOp) {
 
     private var flushQueue: mutable.ArrayDeque[FileRegion | RecyclablePageBuffer] = _
@@ -134,12 +134,13 @@ class NioUnsafeSocketChannel(channel: AbstractChannel, ch: SocketChannel, readIn
             buf.next = null
             if (!closed) {
                 val writable   = buf.readableBytes
-                val byteBuffer = buf.byteBuffer
+                val byteBuffer = buf.underlying
                 byteBuffer.limit(buf.writerOffset)
                 byteBuffer.position(buf.readerOffset)
                 try {
                     val write = ch.write(byteBuffer)
-                    if (write != writable) {
+                    if (write == writable) buf.close()
+                    else {
                         continue = false
                         buf.skipReadableBytes(write)
                         buf.next = cursor
@@ -148,7 +149,7 @@ class NioUnsafeSocketChannel(channel: AbstractChannel, ch: SocketChannel, readIn
                         val interestOps = _selectionKey.interestOps()
                         if ((interestOps & SelectionKey.OP_WRITE) == 0)
                             _selectionKey.interestOps(interestOps | SelectionKey.OP_WRITE)
-                    } else buf.close()
+                    }
                 } catch {
                     case e: IOException =>
                         unsafeClose(Some(e))

diff --git a/core/src/cc/otavia/core/transport/reactor/nio/NioHandler.scala b/core/src/cc/otavia/core/transport/reactor/nio/NioHandler.scala
@@ -398,7 +398,6 @@ final class NioHandler(val selectorProvider: SelectorProvider, val selectStrateg
     override def isCompatible(handleType: Class[? <: AbstractChannel]): Boolean = ???
     // classOf[AbstractNioChannel[?, ?]].isAssignableFrom(handleType)
 
-    @throws[IOException]
     private def selectNow(): Int = selector.selectNow()
 
     private def select(context: IoExecutionContext): Unit = {
@@ -410,7 +409,7 @@ final class NioHandler(val selectorProvider: SelectorProvider, val selectStrateg
                 // It might be pended until idle timeout if IdleStateHandler existed in pipeline.
                 selector.selectNow()
             } else {
-                selector.select(10)
+                selector.select()
             }
         } catch {
             case e: CancelledKeyException => // Harmless exception - log anyway
@@ -421,7 +420,6 @@ final class NioHandler(val selectorProvider: SelectorProvider, val selectStrateg
         }
     }
 
-    @throws[IOException]
     private def selectRebuildSelector(selectCnt: Int): Selector = {
         // The selector returned prematurely many times in a row.
         // Rebuild the selector to work around the problem.

diff --git a/core/src/cc/otavia/core/transport/reactor/nio/SelectedSelectionKeySet.scala b/core/src/cc/otavia/core/transport/reactor/nio/SelectedSelectionKeySet.scala
@@ -20,7 +20,6 @@ package cc.otavia.core.transport.reactor.nio
 
 import java.nio.channels.SelectionKey
 import java.util
-import java.util.Arrays
 import scala.language.unsafeNulls
 
 final class SelectedSelectionKeySet extends util.AbstractSet[SelectionKey] {
@@ -37,21 +36,21 @@ final class SelectedSelectionKeySet extends util.AbstractSet[SelectionKey] {
 
     override def remove(o: Any): Boolean = false
 
-    override def contains(o: Any): Boolean = false
-
-//    override def contains(o: Any): Boolean = {
-//        var i        = 0
-//        var continue = true
-//        var res      = false
-//        while (continue && i < _size) {
-//            val key = keys(i)
-//            if (key.equals(o)) {
-//                continue = false
-//                res = true
-//            } else i += 1
-//        }
-//        res
-//    }
+    // override def contains(o: Any): Boolean = false
+
+    override def contains(o: Any): Boolean = {
+        var i        = 0
+        var continue = true
+        var res      = false
+        while (continue && i < _size) {
+            val key = keys(i)
+            if (key.equals(o)) {
+                continue = false
+                res = true
+            } else i += 1
+        }
+        res
+    }
 
     override def size(): Int = _size
 

diff --git a/core/src/cc/otavia/core/transport/reactor/nio/SelectedSelectionKeySetSelector.scala b/core/src/cc/otavia/core/transport/reactor/nio/SelectedSelectionKeySetSelector.scala
@@ -18,9 +18,6 @@
 
 package cc.otavia.core.transport.reactor.nio
 
-import cc.otavia.core.transport.reactor.nio.SelectedSelectionKeySet
-
-import java.io.IOException
 import java.nio.channels.spi.SelectorProvider
 import java.nio.channels.{SelectionKey, Selector}
 import java.util
@@ -39,19 +36,16 @@ final class SelectedSelectionKeySetSelector(
 
     override def selectedKeys(): util.Set[SelectionKey] = delegate.selectedKeys()
 
-    @throws[IOException]
     override def selectNow(): Int = {
         selectionKeys.reset()
         delegate.selectNow()
     }
 
-    @throws[IOException]
     override def select(timeout: Long): Int = {
         selectionKeys.reset()
         delegate.select(timeout)
     }
 
-    @throws[IOException]
     override def select(): Int = {
         selectionKeys.reset()
         delegate.select()