diff --git a/promise/promise.go b/promise/promise.go index 6e41369..3c3a0bb 100644 --- a/promise/promise.go +++ b/promise/promise.go @@ -177,7 +177,7 @@ func All[T any](promises []*Promise[T]) *Promise[[]T] { return New(func(resolve func([]T), reject func(error)) { valsChan := make(chan tuple[T, int], len(promises)) - errsChan := make(chan error, 1) + errsChan := make(chan error, len(promises)) for idx, p := range promises { idx := idx @@ -212,8 +212,10 @@ func Race[T any](promises []*Promise[T]) *Promise[T] { } return New(func(resolve func(T), reject func(error)) { - valsChan := make(chan T, 1) - errsChan := make(chan error, 1) + // every promise may settle, so each channel holds all of them. A smaller + // buffer leaves the callbacks of the losing promises blocked forever. + valsChan := make(chan T, len(promises)) + errsChan := make(chan error, len(promises)) for _, p := range promises { _ = Then(p, func(data T) T { @@ -243,7 +245,7 @@ func Any[T any](promises []*Promise[T]) *Promise[T] { } return New(func(resolve func(T), reject func(error)) { - valsChan := make(chan T, 1) + valsChan := make(chan T, len(promises)) errsChan := make(chan tuple[error, int], len(promises)) for idx, p := range promises { diff --git a/promise/promise_test.go b/promise/promise_test.go index 677e46c..2dba37f 100644 --- a/promise/promise_test.go +++ b/promise/promise_test.go @@ -2,6 +2,7 @@ package promise import ( "errors" + "runtime" "testing" "time" @@ -310,3 +311,39 @@ func TestRace(t *testing.T) { }) } + +func TestRaceAnyAllDoNotLeakGoroutines(t *testing.T) { + // not parallel: it counts the goroutines of the whole test binary + assert := internal.NewAssert(t, "TestRaceAnyAllDoNotLeakGoroutines") + + newResolved := func(n int) []*Promise[int] { + ps := make([]*Promise[int], 0, 3) + for i := 0; i < 3; i++ { + ps = append(ps, New(func(resolve func(int), reject func(error)) { resolve(n) })) + } + return ps + } + newRejected := func() []*Promise[int] { + ps := make([]*Promise[int], 0, 3) + for i := 0; i < 3; i++ { + ps = append(ps, New(func(resolve func(int), reject func(error)) { reject(errors.New("e")) })) + } + return ps + } + + before := runtime.NumGoroutine() + + for i := 0; i < 20; i++ { + _, _ = Race(newResolved(i)).Await() + _, _ = Race(newRejected()).Await() + _, _ = Any(newResolved(i)).Await() + _, _ = All(newRejected()).Await() + } + + deadline := time.Now().Add(2 * time.Second) + for runtime.NumGoroutine() > before && time.Now().Before(deadline) { + time.Sleep(10 * time.Millisecond) + } + + assert.Equal(true, runtime.NumGoroutine() <= before) +}