Merge remote-tracking branch 'reactive-swift/develop' into develop

ypopovych · ypopovych · commit 8109e3d29b1c · 2016-05-06T19:23:36.000+03:00
# Conflicts:
#	ExecutionContext.xcodeproj/project.pbxproj
diff --git a/ExecutionContext.xcodeproj/project.pbxproj b/ExecutionContext.xcodeproj/project.pbxproj
@@ -13,8 +13,12 @@
 		65D637A01C9437BB000F5548 /* DispatchExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379A1C9437BB000F5548 /* DispatchExecutionContext.swift */; };
 		65D637A11C9437BB000F5548 /* ExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379B1C9437BB000F5548 /* ExecutionContext.swift */; };
 		65D637A21C9437BB000F5548 /* ImmediateExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379C1C9437BB000F5548 /* ImmediateExecutionContext.swift */; };
-		65D637A31C9437BB000F5548 /* RunLoopExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379D1C9437BB000F5548 /* RunLoopExecutionContext.swift */; };
 		65D637A51C9437F4000F5548 /* ExecutionContextTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D637A41C9437F4000F5548 /* ExecutionContextTests.swift */; };
+		65FD8EC01CD9BC340046D5D6 /* ExecutionContextTenant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65FD8EBF1CD9BC340046D5D6 /* ExecutionContextTenant.swift */; };
+		65FD8EC11CD9BC340046D5D6 /* ExecutionContextTenant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65FD8EBF1CD9BC340046D5D6 /* ExecutionContextTenant.swift */; };
+		65FD8EC21CD9BC340046D5D6 /* ExecutionContextTenant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65FD8EBF1CD9BC340046D5D6 /* ExecutionContextTenant.swift */; };
+		65FD8EC31CD9BC340046D5D6 /* ExecutionContextTenant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65FD8EBF1CD9BC340046D5D6 /* ExecutionContextTenant.swift */; };
+		92B0010A1CDCFB8D00E23C7B /* RunLoopExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379D1C9437BB000F5548 /* RunLoopExecutionContext.swift */; };
 		92E4091A1CBC32F2001ED069 /* ExecutionContext.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92E409101CBC32F2001ED069 /* ExecutionContext.framework */; };
 		92E409271CBC3369001ED069 /* ExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379B1C9437BB000F5548 /* ExecutionContext.swift */; };
 		92E409281CBC336D001ED069 /* CustomExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D637981C9437BB000F5548 /* CustomExecutionContext.swift */; };
@@ -167,6 +171,7 @@
 		65D6379C1C9437BB000F5548 /* ImmediateExecutionContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImmediateExecutionContext.swift; sourceTree = "<group>"; };
 		65D6379D1C9437BB000F5548 /* RunLoopExecutionContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RunLoopExecutionContext.swift; sourceTree = "<group>"; };
 		65D637A41C9437F4000F5548 /* ExecutionContextTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExecutionContextTests.swift; sourceTree = "<group>"; };
+		65FD8EBF1CD9BC340046D5D6 /* ExecutionContextTenant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExecutionContextTenant.swift; sourceTree = "<group>"; };
 		92E409101CBC32F2001ED069 /* ExecutionContext.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ExecutionContext.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		92E409191CBC32F2001ED069 /* ExecutionContextTests-iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ExecutionContextTests-iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		92E4092E1CBC33F9001ED069 /* Boilerplate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Boilerplate.framework; sourceTree = "<group>"; };
@@ -314,6 +319,7 @@
 				65D6379A1C9437BB000F5548 /* DispatchExecutionContext.swift */,
 				65D6379C1C9437BB000F5548 /* ImmediateExecutionContext.swift */,
 				65D6379D1C9437BB000F5548 /* RunLoopExecutionContext.swift */,
+				65FD8EBF1CD9BC340046D5D6 /* ExecutionContextTenant.swift */,
 				65D637831C943764000F5548 /* Info.plist */,
 			);
 			path = ExecutionContext;
@@ -664,9 +670,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				65D637A31C9437BB000F5548 /* RunLoopExecutionContext.swift in Sources */,
+				65FD8EC01CD9BC340046D5D6 /* ExecutionContextTenant.swift in Sources */,
 				65D6379F1C9437BB000F5548 /* DefaultExecutionContext.swift in Sources */,
 				65D6379E1C9437BB000F5548 /* CustomExecutionContext.swift in Sources */,
+				92B0010A1CDCFB8D00E23C7B /* RunLoopExecutionContext.swift in Sources */,
 				65D637A21C9437BB000F5548 /* ImmediateExecutionContext.swift in Sources */,
 				65D637A11C9437BB000F5548 /* ExecutionContext.swift in Sources */,
 				65D637A01C9437BB000F5548 /* DispatchExecutionContext.swift in Sources */,
@@ -685,6 +692,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				65FD8EC11CD9BC340046D5D6 /* ExecutionContextTenant.swift in Sources */,
 				92E409271CBC3369001ED069 /* ExecutionContext.swift in Sources */,
 				92E409291CBC3371001ED069 /* DefaultExecutionContext.swift in Sources */,
 				92E4092B1CBC3378001ED069 /* ImmediateExecutionContext.swift in Sources */,
@@ -705,6 +713,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				65FD8EC21CD9BC340046D5D6 /* ExecutionContextTenant.swift in Sources */,
 				92E40A0F1CC10713001ED069 /* ExecutionContext.swift in Sources */,
 				92E40A111CC10713001ED069 /* DefaultExecutionContext.swift in Sources */,
 				92E40A131CC10713001ED069 /* ImmediateExecutionContext.swift in Sources */,
@@ -725,6 +734,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				65FD8EC31CD9BC340046D5D6 /* ExecutionContextTenant.swift in Sources */,
 				92E40A361CC10816001ED069 /* ExecutionContext.swift in Sources */,
 				92E40A381CC10816001ED069 /* DefaultExecutionContext.swift in Sources */,
 				92E40A3A1CC10816001ED069 /* ImmediateExecutionContext.swift in Sources */,
diff --git a/ExecutionContext/DispatchExecutionContext.swift b/ExecutionContext/DispatchExecutionContext.swift
@@ -25,9 +25,9 @@
     private extension ExecutionContextKind {
         func createDispatchQueue(id:String) -> dispatch_queue_t! {
             switch self {
-            case .Serial:
+            case .serial:
                 return dispatch_queue_create(id, DISPATCH_QUEUE_SERIAL)
-            case .Parallel:
+            case .parallel:
                 return dispatch_queue_create(id, DISPATCH_QUEUE_CONCURRENT)
             }
         }
diff --git a/ExecutionContext/ExecutionContext.swift b/ExecutionContext/ExecutionContext.swift
@@ -148,8 +148,8 @@ public extension ErrorHandlerRegistryType where Self : TaskSchedulerType {
 }
 
 public enum ExecutionContextKind {
-    case Serial
-    case Parallel
+    case serial
+    case parallel
 }
 
 public typealias ExecutionContext = DefaultExecutionContext
@@ -177,4 +177,16 @@ public extension ExecutionContextType {
             return currentContext.value!
         }
     }
+}
+
+public extension ExecutionContextType {
+    //if context is current - executes immediately. Schedules to the context otherwise
+    public func immediateIfCurrent(task:SafeTask) {
+        //can avoid first check but is here for optimization
+        if immediate.isEqualTo(self) || isCurrent {
+            task()
+        } else {
+            execute(task)
+        }
+    }
 }
diff --git a/ExecutionContext/ExecutionContextTenant.swift b/ExecutionContext/ExecutionContextTenant.swift
@@ -0,0 +1,25 @@
+//===--- ExecutionContextTenant.swift ------------------------------------------------------===//
+//Copyright (c) 2016 Daniel Leping (dileping)
+//
+//Licensed under the Apache License, Version 2.0 (the "License");
+//you may not use this file except in compliance with the License.
+//You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing, software
+//distributed under the License is distributed on an "AS IS" BASIS,
+//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//See the License for the specific language governing permissions and
+//limitations under the License.
+//===----------------------------------------------------------------------===//
+
+public protocol ExecutionContextTenantProtocol {
+    var context:ExecutionContextType {get}
+}
+
+public protocol MovableExecutionContextTenantProtocol : ExecutionContextTenantProtocol {
+    associatedtype SettledTenant
+    
+    func settle(in context:ExecutionContextType) -> SettledTenant
+}
diff --git a/ExecutionContext/RunLoopExecutionContext.swift b/ExecutionContext/RunLoopExecutionContext.swift
@@ -132,9 +132,9 @@ private class SerialContext : ExecutionContextBase, ExecutionContextType {
 private extension ExecutionContextKind {
     func createInnerContext() -> ExecutionContextType {
         switch self {
-        case .Serial:
+        case .serial:
             return SerialContext()
-        case .Parallel:
+        case .parallel:
             return ParallelContext()
         }
     }
@@ -183,7 +183,7 @@ public class RunLoopExecutionContext : ExecutionContextBase, ExecutionContextTyp
     }
     
     public static let main:ExecutionContextType = RunLoopExecutionContext(inner: SerialContext(runLoop: RunLoop.main))
-    public static let global:ExecutionContextType = RunLoopExecutionContext(kind: .Parallel)
+    public static let global:ExecutionContextType = RunLoopExecutionContext(kind: .parallel)
     
     @noreturn
     public static func mainProc() {
diff --git a/Tests/ExecutionContext/ExecutionContextTests.swift b/Tests/ExecutionContext/ExecutionContextTests.swift
@@ -102,7 +102,7 @@ class ExecutionContextTests: XCTestCase {
     }
     
     func testSerial() {
-        let context:ExecutionContextType = DefaultExecutionContext(kind: .Serial)
+        let context:ExecutionContextType = DefaultExecutionContext(kind: .serial)
         
         syncTest(context)
         asyncTest(context)
@@ -111,7 +111,7 @@ class ExecutionContextTests: XCTestCase {
     }
     
     func testParallel() {
-        let context:ExecutionContextType = DefaultExecutionContext(kind: .Parallel)
+        let context:ExecutionContextType = DefaultExecutionContext(kind: .parallel)
         
         syncTest(context)
         asyncTest(context)

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@`
`25`	`25`	`private extension ExecutionContextKind {`
`26`	`26`	`func createDispatchQueue(id:String) -> dispatch_queue_t! {`
`27`	`27`	`switch self {`
`28`		`- case .Serial:`
	`28`	`+ case .serial:`
`29`	`29`	`return dispatch_queue_create(id, DISPATCH_QUEUE_SERIAL)`
`30`		`- case .Parallel:`
	`30`	`+ case .parallel:`
`31`	`31`	`return dispatch_queue_create(id, DISPATCH_QUEUE_CONCURRENT)`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,8 @@ public extension ErrorHandlerRegistryType where Self : TaskSchedulerType {`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`public enum ExecutionContextKind {`
`151`		`- case Serial`
`152`		`- case Parallel`
	`151`	`+ case serial`
	`152`	`+ case parallel`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`public typealias ExecutionContext = DefaultExecutionContext`
`@@ -177,4 +177,16 @@ public extension ExecutionContextType {`
`177`	`177`	`return currentContext.value!`
`178`	`178`	`}`
`179`	`179`	`}`
	`180`	`+}`
	`181`	`+`
	`182`	`+public extension ExecutionContextType {`
	`183`	`+ //if context is current - executes immediately. Schedules to the context otherwise`
	`184`	`+ public func immediateIfCurrent(task:SafeTask) {`
	`185`	`+ //can avoid first check but is here for optimization`
	`186`	`+ if immediate.isEqualTo(self) \|\| isCurrent {`
	`187`	`+ task()`
	`188`	`+ } else {`
	`189`	`+ execute(task)`
	`190`	`+ }`
	`191`	`+ }`
`180`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,9 +132,9 @@ private class SerialContext : ExecutionContextBase, ExecutionContextType {`
`132`	`132`	`private extension ExecutionContextKind {`
`133`	`133`	`func createInnerContext() -> ExecutionContextType {`
`134`	`134`	`switch self {`
`135`		`- case .Serial:`
	`135`	`+ case .serial:`
`136`	`136`	`return SerialContext()`
`137`		`- case .Parallel:`
	`137`	`+ case .parallel:`
`138`	`138`	`return ParallelContext()`
`139`	`139`	`}`
`140`	`140`	`}`
`@@ -183,7 +183,7 @@ public class RunLoopExecutionContext : ExecutionContextBase, ExecutionContextTyp`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`public static let main:ExecutionContextType = RunLoopExecutionContext(inner: SerialContext(runLoop: RunLoop.main))`
`186`		`- public static let global:ExecutionContextType = RunLoopExecutionContext(kind: .Parallel)`
	`186`	`+ public static let global:ExecutionContextType = RunLoopExecutionContext(kind: .parallel)`
`187`	`187`
`188`	`188`	`@noreturn`
`189`	`189`	`public static func mainProc() {`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ class ExecutionContextTests: XCTestCase {`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`func testSerial() {`
`105`		`- let context:ExecutionContextType = DefaultExecutionContext(kind: .Serial)`
	`105`	`+ let context:ExecutionContextType = DefaultExecutionContext(kind: .serial)`
`106`	`106`
`107`	`107`	`syncTest(context)`
`108`	`108`	`asyncTest(context)`
`@@ -111,7 +111,7 @@ class ExecutionContextTests: XCTestCase {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`func testParallel() {`
`114`		`- let context:ExecutionContextType = DefaultExecutionContext(kind: .Parallel)`
	`114`	`+ let context:ExecutionContextType = DefaultExecutionContext(kind: .parallel)`
`115`	`115`
`116`	`116`	`syncTest(context)`
`117`	`117`	`asyncTest(context)`