use !os(Linux) instead of HAVE_MACH where appropriate

also make vnode source unavailable on linux

Author: dgrove-oss

src/swift/DispatchStubs.cc

@@ -179,11 +179,15 @@ SOURCE(MACH_SEND)
 SOURCE(MACH_RECV)
 SOURCE(MEMORYPRESSURE)
 #endif
+#ifndef __linux__
 SOURCE(PROC)
+#endif
 SOURCE(READ)
 SOURCE(SIGNAL)
 SOURCE(TIMER)
+#ifndef __linux__
 SOURCE(VNODE)
+#endif
 SOURCE(WRITE)
 
 // See comment in CFFuntime.c explaining why objc_retainAutoreleasedReturnValue is needed.

src/swift/Source.swift

@@ -113,7 +113,7 @@ public extension DispatchSource {
 	}
 #endif
 
-#if HAVE_MACH
+#if !os(Linux)
 	public struct ProcessEvent : OptionSet, RawRepresentable {
 		public let rawValue: UInt
 		public init(rawValue: UInt) { self.rawValue = rawValue }
@@ -171,7 +171,7 @@ public extension DispatchSource {
 	}
 #endif
 
-#if HAVE_MACH
+#if !os(Linux)
 	public class func process(identifier: pid_t, eventMask: ProcessEvent, queue: DispatchQueue? = nil) -> DispatchSourceProcess {
 		let source = dispatch_source_create(_swift_dispatch_source_type_proc(), UInt(identifier), eventMask.rawValue, queue?.__wrapped)
 		return DispatchSource(source: source) as DispatchSourceProcess
@@ -203,10 +203,12 @@ public extension DispatchSource {
 		return DispatchSource(source: source) as DispatchSourceUserDataOr
 	}
 
+#if !os(Linux)
 	public class func fileSystemObject(fileDescriptor: Int32, eventMask: FileSystemEvent, queue: DispatchQueue? = nil) -> DispatchSourceFileSystemObject {
 		let source = dispatch_source_create(_swift_dispatch_source_type_vnode(), UInt(fileDescriptor), eventMask.rawValue, queue?.__wrapped)
 		return DispatchSource(source: source) as DispatchSourceFileSystemObject
 	}
+#endif
 
 	public class func write(fileDescriptor: Int32, queue: DispatchQueue? = nil) -> DispatchSourceWrite {
 		let source = dispatch_source_create(_swift_dispatch_source_type_write(), UInt(fileDescriptor), 0, queue?.__wrapped)
@@ -254,7 +256,7 @@ public extension DispatchSourceMemoryPressure {
 }
 #endif
 
-#if HAVE_MACH
+#if !os(Linux)
 public extension DispatchSourceProcess {
 	public var handle: pid_t {
 		return pid_t(dispatch_source_get_handle(self as! DispatchSource))
@@ -330,6 +332,7 @@ public extension DispatchSourceTimer {
 	}
 }
 
+#if !os(Linux)
 public extension DispatchSourceFileSystemObject {
 	public var handle: Int32 {
 		return Int32(dispatch_source_get_handle((self as! DispatchSource).__wrapped))
@@ -345,6 +348,7 @@ public extension DispatchSourceFileSystemObject {
 		return DispatchSource.FileSystemEvent(rawValue: data)
 	}
 }
+#endif
 
 public extension DispatchSourceUserDataAdd {
 	/// @function mergeData
@@ -388,6 +392,7 @@ internal func _swift_dispatch_source_type_data_add() -> dispatch_source_type_t
 @_silgen_name("_swift_dispatch_source_type_DATA_OR")
 internal func _swift_dispatch_source_type_data_or() -> dispatch_source_type_t
 
+#if HAVE_MACH
 @_silgen_name("_swift_dispatch_source_type_MACH_SEND")
 internal func _swift_dispatch_source_type_mach_send() -> dispatch_source_type_t
 
@@ -396,9 +401,12 @@ internal func _swift_dispatch_source_type_mach_recv() -> dispatch_source_type_t
 
 @_silgen_name("_swift_dispatch_source_type_MEMORYPRESSURE")
 internal func _swift_dispatch_source_type_memorypressure() -> dispatch_source_type_t
+#endif
 
+#if !os(Linux)
 @_silgen_name("_swift_dispatch_source_type_PROC")
 internal func _swift_dispatch_source_type_proc() -> dispatch_source_type_t
+#endif
 
 @_silgen_name("_swift_dispatch_source_type_READ")
 internal func _swift_dispatch_source_type_read() -> dispatch_source_type_t
@@ -409,8 +417,10 @@ internal func _swift_dispatch_source_type_signal() -> dispatch_source_type_t
 @_silgen_name("_swift_dispatch_source_type_TIMER")
 internal func _swift_dispatch_source_type_timer() -> dispatch_source_type_t
 
+#if !os(Linux)
 @_silgen_name("_swift_dispatch_source_type_VNODE")
 internal func _swift_dispatch_source_type_vnode() -> dispatch_source_type_t
+#endif
 
 @_silgen_name("_swift_dispatch_source_type_WRITE")
 internal func _swift_dispatch_source_type_write() -> dispatch_source_type_t

src/swift/Wrapper.swift

@@ -139,11 +139,13 @@ public class DispatchQueue : DispatchObject {
 	}
 }
 
+// FIXME: the list of implemented protocols is OS dependent.
+//        need to properly conditionalize this declaration.
 public class DispatchSource : DispatchObject,
 	DispatchSourceType,	DispatchSourceRead,
 	DispatchSourceSignal, DispatchSourceTimer,
 	DispatchSourceUserDataAdd, DispatchSourceUserDataOr,
-	DispatchSourceFileSystemObject, DispatchSourceWrite {
+	DispatchSourceWrite {
 	internal let __wrapped:dispatch_source_t
 
 	internal override func wrapped() -> dispatch_object_t {
@@ -218,7 +220,7 @@ public protocol DispatchSourceMemoryPressure : DispatchSourceType {
 }
 #endif
 
-#if HAVE_MACH
+#if !os(Linux)
 public protocol DispatchSourceProcess : DispatchSourceType {
   var handle: pid_t { get }
 
@@ -250,13 +252,15 @@ public protocol DispatchSourceTimer : DispatchSourceType {
   func setTimer(walltime start: DispatchWallTime, interval: Double, leeway: DispatchTimeInterval)
 }
 
+#if !os(Linux)
 public protocol DispatchSourceFileSystemObject : DispatchSourceType {
   var handle: Int32 { get }
 
   var data: DispatchSource.FileSystemEvent { get }
 
   var mask: DispatchSource.FileSystemEvent { get }
 }
+#endif
 
 public protocol DispatchSourceWrite : DispatchSourceType {