Make it commit order and receive order are same in concurrent #101

VergeGroup · Apr 30, 2020 · 0f9482c · 0f9482c
1 parent 2278973
commit 0f9482c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/Sources/VergeCore/Storage.swift b/Sources/VergeCore/Storage.swift
@@ -136,13 +136,17 @@ open class Storage<Value>: ReadonlyStorage<Value> {
 
     lock()
     do {
+
       let r = try update(&nonatomicValue)
       let notifyValue = nonatomicValue
-      unlock()
-      // TODO: cause cracking the order of event
+
       if notificationFilter(notifyValue) {
+        // notify the event with locking
+        // it may cause dead-lock in somecase
         notifyDidUpdate(value: notifyValue)
       }
+
+      unlock()
       return r
     } catch {
       unlock()

diff --git a/Tests/VergeStoreTests/VergeStoreTests.swift b/Tests/VergeStoreTests/VergeStoreTests.swift
@@ -305,15 +305,13 @@ final class VergeStoreTests: XCTestCase {
   }
 
   func testOrderOfEvents() {
-
-    // Currently, it's collapsed because Storage emits event without locking.
-
+
     let store = VergeStore.Store<DemoState, Never>(initialState: .init(), logger: nil)
 
     let exp = expectation(description: "")
     let counter = expectation(description: "update count")
     counter.assertForOverFulfill = true
-    counter.expectedFulfillmentCount = 1001
+    counter.expectedFulfillmentCount = 10001
 
     let results: VergeConcurrency.Atomic<[Int]> = .init([])
 
@@ -325,7 +323,7 @@ final class VergeStoreTests: XCTestCase {
     }
 
     DispatchQueue.global().async {
-      DispatchQueue.concurrentPerform(iterations: 1000) { (i) in
+      DispatchQueue.concurrentPerform(iterations: 10000) { (i) in
         store.commit {
           $0.count += 1
         }
@@ -335,7 +333,7 @@ final class VergeStoreTests: XCTestCase {
     }
 
     wait(for: [exp, counter], timeout: 10)
-    XCTAssertEqual(Array((0...1000).map { $0 }), results.value)
+    XCTAssertEqual(Array((0...10000).map { $0 }), results.value)
     withExtendedLifetime(sub) {}
   }
 

diff --git a/Verge.xcodeproj/xcshareddata/xcschemes/LightAll.xcscheme b/Verge.xcodeproj/xcshareddata/xcschemes/LightAll.xcscheme
@@ -205,9 +205,6 @@
                <Test
                   Identifier = "VergeStoreTests/testDeadlock()">
                </Test>
-               <Test
-                  Identifier = "VergeStoreTests/testOrderOfEvents()">
-               </Test>
             </SkippedTests>
          </TestableReference>
          <TestableReference