Update Looper.Executor

Author: colemancda

Sources/AndroidLooper/Constants.swift

@@ -6,7 +6,6 @@
 //
 
 #if !os(Android)
-
 import CoreFoundation
 
 typealias AVsyncId = Int64
@@ -16,9 +15,6 @@ typealias AChoreographer_frameCallback64 = @convention(c) (Int64, UnsafeMutableR
 typealias AChoreographer_vsyncCallback = @convention(c) (UnsafePointer<OpaquePointer>?, UnsafeMutableRawPointer?) -> Void
 typealias AChoreographer_refreshRateCallback = @convention(c) (Int64, UnsafeMutableRawPointer?) -> Void
 
-var EFD_CLOEXEC: Int32 { stub() }
-var EFD_NONBLOCK: Int32 { stub() }
-
 var ALOOPER_PREPARE_ALLOW_NON_CALLBACKS: Int { stub() }
 
 var ALOOPER_EVENT_INPUT: Int { stub() }

Sources/AndroidLooper/SerialExecutor.swift

@@ -13,37 +13,46 @@ import AndroidNDK
 import CoreFoundation
 import Dispatch
 import SystemPackage
+import Socket
 
 @available(macOS 13.0, iOS 13.0, *)
 public extension Looper {
 
     // Swift structured concurrency executor that enqueues jobs on an Android Looper.
     final class Executor: SerialExecutor, @unchecked Sendable {
 
-        let eventFd: FileDescriptor
+        #if os(Android)
+        let eventFd: SocketDescriptor.Event
+        #endif
         let looper: Looper
         let queue = LockedState(initialState: [UnownedJob]())
 
         /// Initialize with Android Looper
         internal init(looper: consuming Looper) throws(AndroidLooperError) {
+            #if os(Android)
+            let eventFd: SocketDescriptor.Event
             // open fd
-            let fd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK) // TODO: Move to System / Socket package
-            if fd < 0 {
-                throw .bionic(Errno(rawValue: errno))
+            do {
+                eventFd = try SocketDescriptor.Event(0, flags: [.closeOnExec, .nonBlocking])
+            }
+            catch {
+                throw .bionic(error)
             }
             // initialize
-            let eventFd = FileDescriptor(rawValue: fd)
             self.eventFd = eventFd
+            #endif
             self.looper = looper
             // Add fd to Looper
             try configureLooper()
         }
 
         deinit {
+            #if os(Android)
             if eventFd.rawValue != -1 {
-                _ = try? looper.remove(fileDescriptor: eventFd)
+                _ = try? looper.remove(fileDescriptor: .init(rawValue: eventFd.rawValue))
                 try? eventFd.close()
             }
+            #endif
         }
 
         /// Enqueue a single job
@@ -66,36 +75,30 @@ internal extension Looper.Executor {
     func configureLooper() throws(AndroidLooperError) {
         do {
             // add to looper
-            try looper.handle.add(fileDescriptor: eventFd, callback: drainAExecutor, data: Unmanaged.passUnretained(self).toOpaque()).get()
+            try looper.handle.add(fileDescriptor: .init(rawValue: eventFd.rawValue), callback: drainAExecutor, data: Unmanaged.passUnretained(self).toOpaque()).get()
         }
         catch {
+            #if os(Android)
             try? eventFd.close()
+            #endif
             throw error
         }
     }
 
     /// Read number of remaining events from eventFd
     var eventsRemaining: UInt64 {
         get throws {
-            var value = UInt64(0)
-            try withUnsafeMutableBytes(of: &value) {
-                guard try eventFd.read(into: $0) == MemoryLayout<UInt64>.size else {
-                    throw Errno.invalidArgument
-                }
-            }
-
-            return value
+            #if os(Android)
+            try eventFd.read().rawValue
+            #endif
         }
     }
 
     /// Increment number of remaining events on eventFd
     func signal() throws {
-        var value = UInt64(1)
-        try withUnsafeBytes(of: &value) { (pointer) throws -> () in
-            guard try eventFd.write(pointer) == MemoryLayout<UInt64>.size else {
-                throw Errno.outOfRange
-            }
-        }
+        #if os(Android)
+        try eventFd.write(1)
+        #endif
     }
 
     /// Drain job queue

Sources/AndroidLooper/Syscalls.swift

@@ -24,13 +24,6 @@ func _dispatch_main_queue_callback_4CF()
 @_silgen_name("_dispatch_get_main_queue_port_4CF")
 func _dispatch_get_main_queue_port_4CF() -> Int32
 
-#if canImport(Darwin)
-
-/// `int eventfd(unsigned int initval, int flags);`
-func eventfd(_ initval: CUnsignedInt, _ flags: CInt) -> CInt { stub() }
-
-#endif
-
 #if !os(Android)
 
 func stub() -> Never {