Skip to content

Commit

Permalink
bug: return the error from Pool.Submit/PoolWithFunc.Invoke accordingly (
Browse files Browse the repository at this point in the history
  • Loading branch information
panjf2000 committed Sep 18, 2023
1 parent 45bc4f5 commit 2ce8d85
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 12 deletions.
13 changes: 7 additions & 6 deletions pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,12 @@ func (p *Pool) Submit(task func()) error {
if p.IsClosed() {
return ErrPoolClosed
}
if w := p.retrieveWorker(); w != nil {

w, err := p.retrieveWorker()
if w != nil {
w.inputFunc(task)
return nil
}
return ErrPoolOverload
return err
}

// Running returns the number of workers currently running.
Expand Down Expand Up @@ -328,7 +329,7 @@ func (p *Pool) addWaiting(delta int) {
}

// retrieveWorker returns an available worker to run the tasks.
func (p *Pool) retrieveWorker() (w worker) {
func (p *Pool) retrieveWorker() (w worker, err error) {
p.lock.Lock()

retry:
Expand All @@ -350,7 +351,7 @@ retry:
// Bail out early if it's in nonblocking mode or the number of pending callers reaches the maximum limit value.
if p.options.Nonblocking || (p.options.MaxBlockingTasks != 0 && p.Waiting() >= p.options.MaxBlockingTasks) {
p.lock.Unlock()
return
return nil, ErrPoolOverload
}

// Otherwise, we'll have to keep them blocked and wait for at least one worker to be put back into pool.
Expand All @@ -360,7 +361,7 @@ retry:

if p.IsClosed() {
p.lock.Unlock()
return
return nil, ErrPoolClosed
}

goto retry
Expand Down
13 changes: 7 additions & 6 deletions pool_func.go
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,12 @@ func (p *PoolWithFunc) Invoke(args interface{}) error {
if p.IsClosed() {
return ErrPoolClosed
}
if w := p.retrieveWorker(); w != nil {

w, err := p.retrieveWorker()
if w != nil {
w.inputParam(args)
return nil
}
return ErrPoolOverload
return err
}

// Running returns the number of workers currently running.
Expand Down Expand Up @@ -334,7 +335,7 @@ func (p *PoolWithFunc) addWaiting(delta int) {
}

// retrieveWorker returns an available worker to run the tasks.
func (p *PoolWithFunc) retrieveWorker() (w worker) {
func (p *PoolWithFunc) retrieveWorker() (w worker, err error) {
p.lock.Lock()

retry:
Expand All @@ -356,7 +357,7 @@ retry:
// Bail out early if it's in nonblocking mode or the number of pending callers reaches the maximum limit value.
if p.options.Nonblocking || (p.options.MaxBlockingTasks != 0 && p.Waiting() >= p.options.MaxBlockingTasks) {
p.lock.Unlock()
return
return nil, ErrPoolOverload
}

// Otherwise, we'll have to keep them blocked and wait for at least one worker to be put back into pool.
Expand All @@ -366,7 +367,7 @@ retry:

if p.IsClosed() {
p.lock.Unlock()
return
return nil, ErrPoolClosed
}

goto retry
Expand Down

0 comments on commit 2ce8d85

Please sign in to comment.