-
Notifications
You must be signed in to change notification settings - Fork 139
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add panic-safe TrySubmit and TrySubmitWait with backward compatibility. #77
Open
Jagerente
wants to merge
1
commit into
gammazero:master
Choose a base branch
from
Jagerente:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -2,6 +2,7 @@ package workerpool | |||||
|
||||||
import ( | ||||||
"context" | ||||||
"errors" | ||||||
"sync" | ||||||
"testing" | ||||||
"time" | ||||||
|
@@ -598,6 +599,89 @@ func TestWorkerLeak(t *testing.T) { | |||||
wp.Stop() | ||||||
} | ||||||
|
||||||
func TestTrySubmit(t *testing.T) { | ||||||
defer goleak.VerifyNone(t) | ||||||
|
||||||
wp := New(1) | ||||||
|
||||||
doneCh := make(chan struct{}) | ||||||
defer close(doneCh) | ||||||
|
||||||
err := wp.TrySubmit(func() { | ||||||
doneCh <- struct{}{} | ||||||
}) | ||||||
if err != nil { | ||||||
t.Error("expected no error") | ||||||
} | ||||||
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*100) | ||||||
defer cancel() | ||||||
|
||||||
select { | ||||||
case <-doneCh: | ||||||
break | ||||||
case <-ctx.Done(): | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Simpler to not create a context for the timeout. |
||||||
t.Error("timed out waiting for function to execute") | ||||||
} | ||||||
|
||||||
wp.Stop() | ||||||
err = wp.TrySubmit(func() { | ||||||
doneCh <- struct{}{} | ||||||
}) | ||||||
if !errors.Is(err, ErrWorkerStopped) { | ||||||
t.Error("expected ErrWorkerStopped") | ||||||
} | ||||||
|
||||||
ctx2, cancel2 := context.WithTimeout(context.Background(), time.Millisecond*100) | ||||||
defer cancel2() | ||||||
|
||||||
select { | ||||||
case <-doneCh: | ||||||
t.Error("function should not have executed") | ||||||
case <-ctx2.Done(): | ||||||
break | ||||||
} | ||||||
} | ||||||
|
||||||
func TestTrySubmitWait(t *testing.T) { | ||||||
defer goleak.VerifyNone(t) | ||||||
|
||||||
wp := New(1) | ||||||
|
||||||
done := make(chan struct{}) | ||||||
err := wp.TrySubmitWait(func() { | ||||||
time.Sleep(100 * time.Millisecond) | ||||||
close(done) | ||||||
}) | ||||||
select { | ||||||
case <-done: | ||||||
if err != nil { | ||||||
t.Error("expected no error") | ||||||
} | ||||||
default: | ||||||
t.Error("TrySubmitWait did not wait for function to execute") | ||||||
} | ||||||
|
||||||
wp.Stop() | ||||||
|
||||||
done2 := make(chan struct{}) | ||||||
defer close(done2) | ||||||
|
||||||
err = wp.TrySubmitWait(func() { | ||||||
time.Sleep(100 * time.Millisecond) | ||||||
close(done2) | ||||||
}) | ||||||
|
||||||
select { | ||||||
case <-done2: | ||||||
t.Error("no execution expected") | ||||||
default: | ||||||
if !errors.Is(err, ErrWorkerStopped) { | ||||||
t.Error("expected ErrWorkerStopped") | ||||||
} | ||||||
} | ||||||
} | ||||||
|
||||||
func anyReady(w *WorkerPool) bool { | ||||||
release := make(chan struct{}) | ||||||
wait := func() { | ||||||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems there is a race here: If WorkerPool is stopped after the
p.Stopped
check, but before the call top.Submit
. Consider usingrecover
and checking for a write to a closed channel error, and then returningErrWorkerStopped
.