Linux cleanup.

RxBlocking/RunLoopLock.swift

@@ -125,4 +125,4 @@ class RunLoopLock {
  }
  }
 }
-#endif
+#endif

RxSwift/Concurrency/Lock.swift

@@ -13,54 +13,8 @@ protocol Lock {
  func unlock()
 }
 
-#if os(Linux)
- import Glibc
-
- /**
- Simple wrapper for spin lock.
- */
- class SpinLock {
- private var _lock: pthread_spinlock_t = 0
-
- init() {
- if (pthread_spin_init(&_lock, 0) != 0) {
- fatalError("Spin lock initialization failed")
- }
- }
-
- func lock() {
- pthread_spin_lock(&_lock)
- }
-
- func unlock() {
- pthread_spin_unlock(&_lock)
- }
-
- func performLocked(action: () -> Void) {
- lock(); defer { unlock() }
- action()
- }
-
- func calculateLocked<T>(action: () -> T) -> T {
- lock(); defer { unlock() }
- return action()
- }
-
- func calculateLockedOrFail<T>(action: () throws -> T) throws -> T {
- lock(); defer { unlock() }
- let result = try action()
- return result
- }
-
- deinit {
- pthread_spin_destroy(&_lock)
- }
- }
-#else
-
- // https://lists.swift.org/pipermail/swift-dev/Week-of-Mon-20151214/000321.html
- typealias SpinLock = NSRecursiveLock
-#endif
+// https://lists.swift.org/pipermail/swift-dev/Week-of-Mon-20151214/000321.html
+typealias SpinLock = NSRecursiveLock
 
 extension NSRecursiveLock : Lock {
  func performLocked(_ action: () -> Void) {
@@ -79,29 +33,3 @@ extension NSRecursiveLock : Lock {
  return result
  }
 }
-
-/*
-let RECURSIVE_MUTEX = _initializeRecursiveMutex()
-
-func _initializeRecursiveMutex() -> pthread_mutex_t {
- var mutex: pthread_mutex_t = pthread_mutex_t()
- var mta: pthread_mutexattr_t = pthread_mutexattr_t()
-
- pthread_mutex_init(&mutex, nil)
- pthread_mutexattr_init(&mta)
- pthread_mutexattr_settype(&mta, PTHREAD_MUTEX_RECURSIVE)
- pthread_mutex_init(&mutex, &mta)
-
- return mutex
-}
-
-extension pthread_mutex_t {
- mutating func lock() {
- pthread_mutex_lock(&self)
- }
-
- mutating func unlock() {
- pthread_mutex_unlock(&self)
- }
-}
-*/

RxSwift/Platform/Platform.Darwin.swift

@@ -17,9 +17,9 @@
  typealias AtomicInt = Int32
  #endif
 
- public let AtomicCompareAndSwap = OSAtomicCompareAndSwap32
- public let AtomicIncrement = OSAtomicIncrement32
- public let AtomicDecrement = OSAtomicDecrement32
+ let AtomicCompareAndSwap = OSAtomicCompareAndSwap32
+ let AtomicIncrement = OSAtomicIncrement32
+ let AtomicDecrement = OSAtomicDecrement32
 
  public extension Thread {
  static func setThreadLocalStorageValue<T: AnyObject>(_ value: T?, forKey key: String

RxSwift/Platform/Platform.Linux.swift

@@ -66,17 +66,17 @@
  typealias AtomicInt = Int64
  #endif
 
- public func AtomicIncrement(_ increment: UnsafeMutablePointer<AtomicInt>) -> AtomicInt {
+ func AtomicIncrement(_ increment: UnsafeMutablePointer<AtomicInt>) -> AtomicInt {
  increment.pointee = increment.pointee + 1
  return increment.pointee
  }
 
- public func AtomicDecrement(_ increment: UnsafeMutablePointer<AtomicInt>) -> AtomicInt {
+ func AtomicDecrement(_ increment: UnsafeMutablePointer<AtomicInt>) -> AtomicInt {
  increment.pointee = increment.pointee - 1
  return increment.pointee
  }
 
- public func AtomicCompareAndSwap(_ l: AtomicInt, _ r: AtomicInt, _ target: UnsafeMutablePointer<AtomicInt>) -> Bool {
+ func AtomicCompareAndSwap(_ l: AtomicInt, _ r: AtomicInt, _ target: UnsafeMutablePointer<AtomicInt>) -> Bool {
  //return __sync_val_compare_and_swap(target, l, r)
  if target.pointee == l {
  target.pointee = r

RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift

@@ -7,9 +7,7 @@
 //
 
 import Foundation
-#if os(Linux)
 import Dispatch
-#endif
 
 /**
 Abstracts the work that needs to be performed on a specific `dispatch_queue_t`. You can also pass a serial dispatch queue, it shouldn't cause any problems.

RxSwift/Schedulers/ConcurrentMainScheduler.swift

@@ -7,9 +7,7 @@
 //
 
 import Foundation
-#if os(Linux)
 import Dispatch
-#endif
 
 /**
 Abstracts work that needs to be performed on `MainThread`. In case `schedule` methods are called from main thread, it will perform action immediately without scheduling.

RxSwift/Schedulers/CurrentThreadScheduler.swift

@@ -7,9 +7,7 @@
 //
 
 import Foundation
-#if os(Linux)
 import Dispatch
-#endif
 
 #if os(Linux)
  let CurrentThreadSchedulerKeyInstance = "RxSwift.CurrentThreadScheduler.SchedulerKey"
@@ -25,39 +23,6 @@ import Dispatch
 
  typealias CurrentThreadSchedulerValue = NSString
  let CurrentThreadSchedulerValueInstance = "RxSwift.CurrentThreadScheduler.SchedulerKey" as NSString
-
- /*
- let CurrentThreadSchedulerKeyInstance = CurrentThreadSchedulerKey()
- let CurrentThreadSchedulerQueueKeyInstance = CurrentThreadSchedulerQueueKey()
-
- typealias CurrentThreadSchedulerValue = CurrentThreadSchedulerKey
- let CurrentThreadSchedulerValueInstance = CurrentThreadSchedulerKeyInstance
-
- @objc class CurrentThreadSchedulerKey : NSObject, NSCopying {
- override func isEqual(_ object: AnyObject?) -> Bool {
- return object === CurrentThreadSchedulerKeyInstance
- }
-
- override var hash: Int { return -904739208 }
-
- //func copy(with zone: NSZone? = nil) -> AnyObject {
- func copyWithZone(zone: NSZone) -> AnyObject {
- return CurrentThreadSchedulerKeyInstance
- }
- }
-
- @objc class CurrentThreadSchedulerQueueKey : NSObject, NSCopying {
- override func isEqual(_ object: AnyObject?) -> Bool {
- return object === CurrentThreadSchedulerQueueKeyInstance
- }
-
- override var hash: Int { return -904739207 }
-
- //func copy(with: NSZone?) -> AnyObject {
- func copyWithZone(zone: NSZone) -> AnyObject {
- return CurrentThreadSchedulerQueueKeyInstance
- }
- }*/
 #endif
 
 /**

RxSwift/Schedulers/DispatchQueueSchedulerQOS.swift

@@ -7,9 +7,7 @@
 //
 
 import Foundation
-#if os(Linux)
 import Dispatch
-#endif
 
 /**
 Identifies one of the global concurrent dispatch queues with specified quality of service class.

RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift

@@ -7,9 +7,7 @@
 //
 
 import Foundation
-#if os(Linux)
 import Dispatch
-#endif
 
 struct DispatchQueueConfiguration {
  let queue: DispatchQueue

RxSwift/Schedulers/MainScheduler.swift

@@ -7,9 +7,7 @@
 //
 
 import Foundation
-#if os(Linux)
 import Dispatch
-#endif
 
 /**
 Abstracts work that needs to be performed on `MainThread`. In case `schedule` methods are called from main thread, it will perform action immediately without scheduling.

RxSwift/Schedulers/SerialDispatchQueueScheduler.swift

@@ -7,9 +7,7 @@
 //
 
 import Foundation
-#if os(Linux)
 import Dispatch
-#endif
 
 /**
 Abstracts the work that needs to be performed on a specific `dispatch_queue_t`. It will make sure 

Tests/RxSwiftTests/MainSchedulerTests.swift

@@ -7,10 +7,7 @@
 //
 
 import Foundation
-#if os(Linux)
 import Dispatch
-#endif
-
 
 import RxSwift
 import XCTest

Tests/RxSwiftTests/Observable+TimeTest.swift

@@ -1209,7 +1209,6 @@ extension ObservableTimeTest {
  }
 
  func testBufferWithTimeOrCount_Default() {
- #if !os(Linux)
  let backgroundScheduler = SerialDispatchQueueScheduler(globalConcurrentQueueQOS: .default)
 
  let result = try! Observable.range(start: 1, count: 10, scheduler: backgroundScheduler)
@@ -1219,7 +1218,6 @@ extension ObservableTimeTest {
  .first()
 
  XCTAssertEqual(result!, [4, 5, 6])
- #endif
  }
 
 }

Tests/RxSwiftTests/SubjectConcurrencyTest.swift

@@ -9,9 +9,7 @@
 import Foundation
 @testable import RxSwift
 import XCTest
-#if os(Linux)
 import Dispatch
-#endif
 
 
 

Tests/XCTest+AllTests.swift

@@ -10,9 +10,7 @@ import Foundation
 import RxSwift
 import RxTests
 import XCTest
-#if os(Linux)
 import Dispatch
-#endif
 
 func XCTAssertErrorEqual(_ lhs: Swift.Error, _ rhs: Swift.Error) {
  let event1: Event<Int> = .error(lhs)