Merge pull request #28 from noppoMan/http-server-performance

Http server performance

Author: noppoMan

Sources/Prorsum/HTTP/Serializer/RequestSerializer.swift

@@ -6,7 +6,7 @@
 //
 //
 
-public class RequestSerializer {
+public struct RequestSerializer {
     let stream: DuplexStream
     let bufferSize: Int
 

Sources/Prorsum/HTTP/Serializer/ResponseSerializer.swift

@@ -6,7 +6,7 @@
 //
 //
 
-public class ResponseSerializer {
+public struct ResponseSerializer {
     let stream: DuplexStream
     let bufferSize: Int
 

Sources/Prorsum/HTTP/StreamWriter/RequestWriter.swift

@@ -6,7 +6,7 @@
 //
 //
 
-public class RequestWriter {
+public struct RequestWriter {
 
     let stream: DuplexStream
 

Sources/Prorsum/HTTP/StreamWriter/ResponseWriter.swift

@@ -6,7 +6,7 @@
 //
 //
 
-public class ResponrWriter {
+public struct ResponrWriter {
 
     let stream: DuplexStream
 

Sources/Prorsum/Net/Net.swift

@@ -8,44 +8,44 @@
 
 #if os(Linux)
     import Glibc
-let sys_off_t = Glibc.off_t()
-let sys_bind = Glibc.bind
-let sys_accept = Glibc.accept
-let sys_listen = Glibc.listen
-let sys_connect = Glibc.connect
-let sys_close = Glibc.close
-let sys_socket = Glibc.socket
-let sys_recv = Glibc.recv
-let sys_send = Glibc.send
-    
-let SOCK_NOSIGNAL = Glibc.MSG_NOSIGNAL
-let SOCK_STREAM = Int32(Glibc.SOCK_STREAM.rawValue)
-let SOCK_DGRAM = Int32(Glibc.SOCK_DGRAM.rawValue)
-let SOCK_SEQPACKET = Int32(Glibc.SOCK_SEQPACKET.rawValue)
-let SOCK_RAW = Int32(Glibc.SOCK_RAW.rawValue)
-let SOCK_RDM = Int32(Glibc.SOCK_RDM.rawValue)
-let SOCK_MAXADDRLEN: Int32 = 255
-let IPPROTO_TCP = Int32(Glibc.IPPROTO_TCP)
+    let sys_off_t = Glibc.off_t()
+    let sys_bind = Glibc.bind
+    let sys_accept = Glibc.accept
+    let sys_listen = Glibc.listen
+    let sys_connect = Glibc.connect
+    let sys_close = Glibc.close
+    let sys_socket = Glibc.socket
+    let sys_recv = Glibc.recv
+    let sys_send = Glibc.send
+        
+    let SOCK_NOSIGNAL = Glibc.MSG_NOSIGNAL
+    let SOCK_STREAM = Int32(Glibc.SOCK_STREAM.rawValue)
+    let SOCK_DGRAM = Int32(Glibc.SOCK_DGRAM.rawValue)
+    let SOCK_SEQPACKET = Int32(Glibc.SOCK_SEQPACKET.rawValue)
+    let SOCK_RAW = Int32(Glibc.SOCK_RAW.rawValue)
+    let SOCK_RDM = Int32(Glibc.SOCK_RDM.rawValue)
+    let SOCK_MAXADDRLEN: Int32 = 255
+    let IPPROTO_TCP = Int32(Glibc.IPPROTO_TCP)
 #else
     import Darwin
-let sys_off_t = Darwin.off_t()
-let sys_bind = Darwin.bind
-let sys_accept = Darwin.accept
-let sys_listen = Darwin.listen
-let sys_connect = Darwin.connect
-let sys_close = Darwin.close
-let sys_socket = Darwin.socket
-let sys_recv = Darwin.recv
-let sys_send = Darwin.send
-    
-let SOCK_NOSIGNAL = Darwin.SO_NOSIGPIPE
-let SOCK_STREAM = Darwin.SOCK_STREAM
-let SOCK_DGRAM = Darwin.SOCK_DGRAM
-let SOCK_SEQPACKET = Darwin.SOCK_SEQPACKET
-let SOCK_RAW = Darwin.SOCK_RAW
-let SOCK_RDM = Darwin.SOCK_RDM
-let IPPROTO_TCP = Darwin.IPPROTO_TCP
-let SOCK_MAXADDRLEN = Darwin.SOCK_MAXADDRLEN
+    let sys_off_t = Darwin.off_t()
+    let sys_bind = Darwin.bind
+    let sys_accept = Darwin.accept
+    let sys_listen = Darwin.listen
+    let sys_connect = Darwin.connect
+    let sys_close = Darwin.close
+    let sys_socket = Darwin.socket
+    let sys_recv = Darwin.recv
+    let sys_send = Darwin.send
+        
+    let SOCK_NOSIGNAL = Darwin.SO_NOSIGPIPE
+    let SOCK_STREAM = Darwin.SOCK_STREAM
+    let SOCK_DGRAM = Darwin.SOCK_DGRAM
+    let SOCK_SEQPACKET = Darwin.SOCK_SEQPACKET
+    let SOCK_RAW = Darwin.SOCK_RAW
+    let SOCK_RDM = Darwin.SOCK_RDM
+    let IPPROTO_TCP = Darwin.IPPROTO_TCP
+    let SOCK_MAXADDRLEN = Darwin.SOCK_MAXADDRLEN
 #endif
 
 public typealias Byte = UInt8

Sources/Prorsum/Net/TCPServer.swift

@@ -9,6 +9,10 @@
 import Foundation
 import Dispatch
 
+private let sourceReadQ = DispatchQueue(label: "prorsum.net.source-read.queue")
+
+private let tcpIncommingRequestHandleQ = DispatchQueue(label: "prorsum.tcp.concurrent-queue", attributes: .concurrent)
+
 public final class TCPServer {
     let stream: TCPStream
 
@@ -45,19 +49,21 @@ public final class TCPServer {
         try stream.socket.bind(host: host, port: port)
     }
 
+    /**
+     * Kitura HTTPServerのように、acceptはループで行い、read/writeを非同期で
+     * DispatchWorkItemを用いている模様
+     */
     public func listen(backlog: Int = 1024) throws {
         try stream.socket.listen(backlog: backlog)
 
-        watcher = DispatchSource.makeReadSource(fileDescriptor: stream.socket.fd, queue: .main)
+        watcher = DispatchSource.makeReadSource(fileDescriptor: stream.socket.fd, queue: sourceReadQ)
 
         watcher?.setEventHandler { [unowned self] in
-            do {
-                let client = try TCPStream(socket: self.stream.socket.accept())
-                go {
+            tcpIncommingRequestHandleQ.async {
+                do {
+                    let client = try TCPStream(socket: self.stream.socket.accept())
                     self.handler(client)
-                }
-            } catch {
-                go {
+                } catch {
                     self.onError?(error)
                 }
             }