chore: Use fd where possible

Author: kylef

Sources/Curassow/Arbiter.swift

@@ -88,7 +88,7 @@ public final class Arbiter<Worker : WorkerType> {
   }
 
   func stop(_ graceful: Bool = true) {
-    listeners.forEach { $0.close() }
+    listeners.forEach { _ = try? $0.close() }
 
     if graceful {
       killWorkers(SIGTERM)
@@ -115,13 +115,13 @@ public final class Arbiter<Worker : WorkerType> {
       timeout = timeval(tv_sec: 30, tv_usec: 0)
     }
 
-    let fds = [signalHandler.pipe.read]
+    let fds = [Socket(descriptor: signalHandler.pipe.reader.fileNumber)]
     let result = try? select(reads: fds, writes: [Socket](), errors: [Socket](), timeout: timeout)
     let read = result?.reads ?? []
 
     if !read.isEmpty {
       do {
-        while try signalHandler.pipe.read.read(1).count > 0 {}
+        while try signalHandler.pipe.reader.read(1).count > 0 {}
       } catch {}
     }
   }

Sources/Curassow/DispatchWorker.swift

@@ -106,7 +106,7 @@ final public class DispatchWorker :  WorkerType {
     sendResponse(client, response: response)
 
     client.shutdown()
-    client.close()
+     _ = try? client.close()
   }
 }
 
@@ -120,7 +120,7 @@ extension Socket {
     }
 
     source.setCancelHandler { [unowned self] in
-      self.close()
+       _ = try? self.close()
     }
 
     source.resume()

Sources/Curassow/Signals.swift

@@ -4,6 +4,8 @@ import Glibc
 import Darwin.C
 #endif
 
+import fd
+
 var sharedHandler: SignalHandler?
 
 class SignalHandler {
@@ -34,20 +36,20 @@ class SignalHandler {
     signal(SIGCHLD, SIG_DFL)
   }
 
-  let pipe: (read: Socket, write: Socket)
+  let pipe: (reader: ReadableFileDescriptor, writer: WritableFileDescriptor)
   var signalQueue: [Signal] = []
 
   init() throws {
-    pipe = try Socket.pipe()
-    pipe.read.closeOnExec = true
-    pipe.read.blocking = false
-    pipe.write.closeOnExec = true
-    pipe.write.blocking = false
+    pipe = try fd.pipe()
+    pipe.reader.closeOnExec = true
+    pipe.reader.blocking = false
+    pipe.writer.closeOnExec = true
+    pipe.writer.blocking = false
   }
 
   // Wake up the process by writing to the pipe
   func wakeup() {
-    pipe.write.send(".")
+    _ = try? pipe.writer.write([46])
   }
 
   func handle(_ signal: Signal) {

Sources/Curassow/Socket.swift

@@ -5,9 +5,7 @@ private let sock_stream = Int32(SOCK_STREAM.rawValue)
 
 private let system_accept = Glibc.accept
 private let system_bind = Glibc.bind
-private let system_close = Glibc.close
 private let system_listen = Glibc.listen
-private let system_read = Glibc.read
 private let system_send = Glibc.send
 private let system_write = Glibc.write
 private let system_shutdown = Glibc.shutdown
@@ -20,9 +18,7 @@ private let sock_stream = SOCK_STREAM
 
 private let system_accept = Darwin.accept
 private let system_bind = Darwin.bind
-private let system_close = Darwin.close
 private let system_listen = Darwin.listen
-private let system_read = Darwin.read
 private let system_send = Darwin.send
 private let system_write = Darwin.write
 private let system_shutdown = Darwin.shutdown
@@ -78,7 +74,7 @@ class Unreader : Readable {
 
 
 /// Represents a TCP AF_INET/AF_UNIX socket
-final public class Socket : Readable, FileDescriptor, Listener, Connection {
+final public class Socket : Readable, FileDescriptor, ReadableFileDescriptor, Listener, Connection {
   typealias Port = UInt16
 
   public let fileNumber: FileNumber
@@ -172,10 +168,6 @@ final public class Socket : Readable, FileDescriptor, Listener, Connection {
     return Socket(descriptor: descriptor)
   }
 
-  func close() {
-    _ = system_close(fileNumber)
-  }
-
   func shutdown() {
     _ = system_shutdown(fileNumber, Int32(SHUT_RDWR))
   }
@@ -206,15 +198,6 @@ final public class Socket : Readable, FileDescriptor, Listener, Connection {
     }
   }
 
-  func read(_ bytes: Int) throws -> [CChar] {
-    let data = Data(capacity: bytes)
-    let bytes = system_read(fileNumber, data.bytes, data.capacity)
-    guard bytes != -1 else {
-        throw SocketError()
-    }
-    return Array(data.characters[0..<bytes])
-  }
-
   /// Returns whether the socket is set to non-blocking or blocking
   var blocking: Bool {
     get {
@@ -261,3 +244,47 @@ final public class Socket : Readable, FileDescriptor, Listener, Connection {
     return (value << 8) + (value >> 8)
   }
 }
+
+extension FileDescriptor {
+  /// Returns whether the socket is set to non-blocking or blocking
+  var blocking: Bool {
+    get {
+      let flags = fcntl(fileNumber, F_GETFL, 0)
+      return flags & O_NONBLOCK == 0
+    }
+
+    set {
+      let flags = fcntl(fileNumber, F_GETFL, 0)
+      let newFlags: Int32
+
+      if newValue {
+        newFlags = flags & ~O_NONBLOCK
+      } else {
+        newFlags = flags | O_NONBLOCK
+      }
+
+      let _ = fcntl(fileNumber, F_SETFL, newFlags)
+    }
+  }
+
+  /// Returns whether the socket is has the FD_CLOEXEC flag set
+  var closeOnExec: Bool {
+    get {
+      let flags = fcntl(fileNumber, F_GETFL, 0)
+      return flags & FD_CLOEXEC == 1
+    }
+
+    set {
+      let flags = fcntl(fileNumber, F_GETFL, 0)
+      let newFlags: Int32
+
+      if newValue {
+        newFlags = flags ^ FD_CLOEXEC
+      } else {
+        newFlags = flags | FD_CLOEXEC
+      }
+
+      let _ = fcntl(fileNumber, F_SETFL, newFlags)
+    }
+  }
+}

Sources/Curassow/SynchronousWorker.swift

@@ -91,7 +91,7 @@ public final class SynchronousWorker : WorkerType {
       notify()
 
       let sockets = wait().filter {
-        $0.fileNumber != sharedHandler!.pipe.read.fileNumber
+        $0.fileNumber != sharedHandler!.pipe.reader.fileNumber
       }
 
       sockets.forEach(accept)
@@ -121,7 +121,7 @@ public final class SynchronousWorker : WorkerType {
       timeout = timeval(tv_sec: 120, tv_usec: 0)
     }
 
-    let socks = listeners + [sharedHandler!.pipe.read]
+    let socks = listeners + [Socket(descriptor: sharedHandler!.pipe.reader.fileNumber)]
     let result = try? fd.select(reads: socks, writes: [Socket](), errors: [Socket](), timeout: timeout)
     return result?.reads ?? []
   }
@@ -153,7 +153,7 @@ public final class SynchronousWorker : WorkerType {
     sendResponse(client, response: response)
 
     client.shutdown()
-    client.close()
+    _ = try? client.close()
   }
 }
 

Tests/CurassowTests/HTTPParserSpec.swift

@@ -46,8 +46,8 @@ func testHTTPParser() {
     }
 
     $0.after {
-      inSocket?.close()
-      outSocket?.close()
+      try! inSocket?.close()
+      try! outSocket?.close()
     }
 
     $0.it("can parse a HTTP request") {
@@ -98,15 +98,15 @@ func testHTTPParser() {
     }
 
     $0.it("throws an error when the client disconnects before sending an HTTP request") {
-      outSocket.close()
+      try outSocket.close()
       outSocket = nil
 
       try expect(try parser.parse()).toThrow()
     }
 
     $0.it("throws an error when the client disconnects before sending the entire message body") {
       outSocket.write("GET / HTTP/1.1\r\nContent-Length: 42\r\n")
-      outSocket.close()
+      try outSocket.close()
       outSocket = nil
 
       try expect(try parser.parse()).toThrow()