Skip to content

Commit

Permalink
fix: solve issue that Promise.all and resolve and cancel can lead crash
Browse files Browse the repository at this point in the history
  • Loading branch information
@0xWOF
0xWOF committed Sep 22, 2023
1 parent 201ba2d commit b6f7304
Showing 1 changed file with 115 additions and 73 deletions.
188 changes: 115 additions & 73 deletions Source/Concurrency/Promise/Composition/PromiseAll.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ extension Promise where

promises.forEach { promise in
group.enter()
var leave = Once { group.leave() }
promise.subscribe(
queue: promise.queue,
onResolved: { _ in group.leave() },
onRejected: { promiseReturn.reject($0); group.leave() },
onCanceled: { promiseReturn.cancel(); group.leave() }
onResolved: { _ in leave() },
onRejected: { promiseReturn.reject($0); leave() },
onCanceled: { promiseReturn.cancel(); leave() }
)
}

Expand Down Expand Up @@ -55,18 +56,20 @@ extension Promise where
let group = DispatchGroup()

group.enter()
var leave0 = Once { group.leave() }
promise0.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onRejected: { promiseReturn.reject($0); group.leave() },
onCanceled: { promiseReturn.cancel(); group.leave() }
onResolved: { _ in leave0() },
onRejected: { promiseReturn.reject($0); leave0() },
onCanceled: { promiseReturn.cancel(); leave0() }
)
group.enter()
var leave1 = Once { group.leave() }
promise1.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onRejected: { promiseReturn.reject($0); group.leave() },
onCanceled: { promiseReturn.cancel(); group.leave() }
onResolved: { _ in leave1() },
onRejected: { promiseReturn.reject($0); leave1() },
onCanceled: { promiseReturn.cancel(); leave1() }
)

group.notify(queue: queue) {
Expand All @@ -93,25 +96,28 @@ extension Promise where
let group = DispatchGroup()

group.enter()
var leave0 = Once { group.leave() }
promise0.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onRejected: { promiseReturn.reject($0); group.leave() },
onCanceled: { promiseReturn.cancel(); group.leave() }
onResolved: { _ in leave0() },
onRejected: { promiseReturn.reject($0); leave0() },
onCanceled: { promiseReturn.cancel(); leave0() }
)
group.enter()
var leave1 = Once { group.leave() }
promise1.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onRejected: { promiseReturn.reject($0); group.leave() },
onCanceled: { promiseReturn.cancel(); group.leave() }
onResolved: { _ in leave1() },
onRejected: { promiseReturn.reject($0); leave1() },
onCanceled: { promiseReturn.cancel(); leave1() }
)
group.enter()
var leave2 = Once { group.leave() }
promise2.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onRejected: { promiseReturn.reject($0); group.leave() },
onCanceled: { promiseReturn.cancel(); group.leave() }
onResolved: { _ in leave2() },
onRejected: { promiseReturn.reject($0); leave2() },
onCanceled: { promiseReturn.cancel(); leave2() }
)

group.notify(queue: queue) {
Expand Down Expand Up @@ -140,32 +146,36 @@ extension Promise where
let group = DispatchGroup()

group.enter()
var leave0 = Once { group.leave() }
promise0.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onRejected: { promiseReturn.reject($0); group.leave() },
onCanceled: { promiseReturn.cancel(); group.leave() }
onResolved: { _ in leave0() },
onRejected: { promiseReturn.reject($0); leave0() },
onCanceled: { promiseReturn.cancel(); leave0() }
)
group.enter()
var leave1 = Once { group.leave() }
promise1.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onRejected: { promiseReturn.reject($0); group.leave() },
onCanceled: { promiseReturn.cancel(); group.leave() }
onResolved: { _ in leave1() },
onRejected: { promiseReturn.reject($0); leave1() },
onCanceled: { promiseReturn.cancel(); leave1() }
)
group.enter()
var leave2 = Once { group.leave() }
promise2.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onRejected: { promiseReturn.reject($0); group.leave() },
onCanceled: { promiseReturn.cancel(); group.leave() }
onResolved: { _ in leave2() },
onRejected: { promiseReturn.reject($0); leave2() },
onCanceled: { promiseReturn.cancel(); leave2() }
)
group.enter()
var leave3 = Once { group.leave() }
promise3.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onRejected: { promiseReturn.reject($0); group.leave() },
onCanceled: { promiseReturn.cancel(); group.leave() }
onResolved: { _ in leave3() },
onRejected: { promiseReturn.reject($0); leave3() },
onCanceled: { promiseReturn.cancel(); leave3() }
)

group.notify(queue: queue) {
Expand Down Expand Up @@ -196,39 +206,44 @@ extension Promise where
let group = DispatchGroup()

group.enter()
var leave0 = Once { group.leave() }
promise0.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onRejected: { promiseReturn.reject($0); group.leave() },
onCanceled: { promiseReturn.cancel(); group.leave() }
onResolved: { _ in leave0() },
onRejected: { promiseReturn.reject($0); leave0() },
onCanceled: { promiseReturn.cancel(); leave0() }
)
group.enter()
var leave1 = Once { group.leave() }
promise1.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onRejected: { promiseReturn.reject($0); group.leave() },
onCanceled: { promiseReturn.cancel(); group.leave() }
onResolved: { _ in leave1() },
onRejected: { promiseReturn.reject($0); leave1() },
onCanceled: { promiseReturn.cancel(); leave1() }
)
group.enter()
var leave2 = Once { group.leave() }
promise2.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onRejected: { promiseReturn.reject($0); group.leave() },
onCanceled: { promiseReturn.cancel(); group.leave() }
onResolved: { _ in leave2() },
onRejected: { promiseReturn.reject($0); leave2() },
onCanceled: { promiseReturn.cancel(); leave2() }
)
group.enter()
var leave3 = Once { group.leave() }
promise3.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onRejected: { promiseReturn.reject($0); group.leave() },
onCanceled: { promiseReturn.cancel(); group.leave() }
onResolved: { _ in leave3() },
onRejected: { promiseReturn.reject($0); leave3() },
onCanceled: { promiseReturn.cancel(); leave3() }
)
group.enter()
var leave4 = Once { group.leave() }
promise4.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onRejected: { promiseReturn.reject($0); group.leave() },
onCanceled: { promiseReturn.cancel(); group.leave() }
onResolved: { _ in leave4() },
onRejected: { promiseReturn.reject($0); leave4() },
onCanceled: { promiseReturn.cancel(); leave4() }
)

group.notify(queue: queue) {
Expand Down Expand Up @@ -262,18 +277,20 @@ extension Promise where
let group = DispatchGroup()

group.enter()
var leave0 = Once { group.leave() }
promise0.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onResolved: { _ in leave0() },
onRejected: { _ in },
onCanceled: { promiseReturn.cancel(); group.leave() }
onCanceled: { promiseReturn.cancel(); leave0() }
)
group.enter()
var leave1 = Once { group.leave() }
promise1.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onResolved: { _ in leave1() },
onRejected: { _ in },
onCanceled: { promiseReturn.cancel(); group.leave() }
onCanceled: { promiseReturn.cancel(); leave1() }
)

group.notify(queue: queue) {
Expand All @@ -300,25 +317,28 @@ extension Promise where
let group = DispatchGroup()

group.enter()
var leave0 = Once { group.leave() }
promise0.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onResolved: { _ in leave0() },
onRejected: { _ in },
onCanceled: { promiseReturn.cancel(); group.leave() }
onCanceled: { promiseReturn.cancel(); leave0() }
)
group.enter()
var leave1 = Once { group.leave() }
promise1.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onResolved: { _ in leave1() },
onRejected: { _ in },
onCanceled: { promiseReturn.cancel(); group.leave() }
onCanceled: { promiseReturn.cancel(); leave1() }
)
group.enter()
var leave2 = Once { group.leave() }
promise2.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onResolved: { _ in leave2() },
onRejected: { _ in },
onCanceled: { promiseReturn.cancel(); group.leave() }
onCanceled: { promiseReturn.cancel(); leave2() }
)

group.notify(queue: queue) {
Expand Down Expand Up @@ -347,32 +367,36 @@ extension Promise where
let group = DispatchGroup()

group.enter()
var leave0 = Once { group.leave() }
promise0.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onResolved: { _ in leave0() },
onRejected: { _ in },
onCanceled: { promiseReturn.cancel(); group.leave() }
onCanceled: { promiseReturn.cancel(); leave0() }
)
group.enter()
var leave1 = Once { group.leave() }
promise1.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onResolved: { _ in leave1() },
onRejected: { _ in },
onCanceled: { promiseReturn.cancel(); group.leave() }
onCanceled: { promiseReturn.cancel(); leave1() }
)
group.enter()
var leave2 = Once { group.leave() }
promise2.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onResolved: { _ in leave2() },
onRejected: { _ in },
onCanceled: { promiseReturn.cancel(); group.leave() }
onCanceled: { promiseReturn.cancel(); leave2() }
)
group.enter()
var leave3 = Once { group.leave() }
promise3.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onResolved: { _ in leave3() },
onRejected: { _ in },
onCanceled: { promiseReturn.cancel(); group.leave() }
onCanceled: { promiseReturn.cancel(); leave3() }
)

group.notify(queue: queue) {
Expand Down Expand Up @@ -403,39 +427,44 @@ extension Promise where
let group = DispatchGroup()

group.enter()
var leave0 = Once { group.leave() }
promise0.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onResolved: { _ in leave0() },
onRejected: { _ in },
onCanceled: { promiseReturn.cancel(); group.leave() }
onCanceled: { promiseReturn.cancel(); leave0() }
)
group.enter()
var leave1 = Once { group.leave() }
promise1.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onResolved: { _ in leave1() },
onRejected: { _ in },
onCanceled: { promiseReturn.cancel(); group.leave() }
onCanceled: { promiseReturn.cancel(); leave1() }
)
group.enter()
var leave2 = Once { group.leave() }
promise2.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onResolved: { _ in leave2() },
onRejected: { _ in },
onCanceled: { promiseReturn.cancel(); group.leave() }
onCanceled: { promiseReturn.cancel(); leave2() }
)
group.enter()
var leave3 = Once { group.leave() }
promise3.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onResolved: { _ in leave3() },
onRejected: { _ in },
onCanceled: { promiseReturn.cancel(); group.leave() }
onCanceled: { promiseReturn.cancel(); leave3() }
)
group.enter()
var leave4 = Once { group.leave() }
promise4.subscribe(
queue: queue,
onResolved: { _ in group.leave() },
onResolved: { _ in leave4() },
onRejected: { _ in },
onCanceled: { promiseReturn.cancel(); group.leave() }
onCanceled: { promiseReturn.cancel(); leave4() }
)

group.notify(queue: queue) {
Expand All @@ -455,3 +484,16 @@ extension Promise where
return promiseReturn
}
}

private struct Once {
var isCalled = false
let block: () -> Void

mutating func callAsFunction() {
if isCalled {
block()
}

isCalled = true
}
}

0 comments on commit b6f7304

Please sign in to comment.