Fix a bug that doesn't release lock #79
Merged
Conversation
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
err!=nil时未释放锁，使用defer p.lock.Unlock()修复
Codecov Report
@@ Coverage Diff @@
## master #79 +/- ##
==========================================
+ Coverage 95.61% 95.66% +0.05%
==========================================
Files 8 8
Lines 524 531 +7
==========================================
+ Hits 501 508 +7
Misses 16 16
Partials 7 7
Continue to review full report at Codecov.
|
panjf2000
requested changes
Feb 26, 2020
pool.go
Outdated
| @@ -247,6 +247,7 @@ func (p *Pool) revertWorker(worker *goWorker) bool { | |||
| } | |||
| worker.recycleTime = time.Now() | |||
| p.lock.Lock() | |||
| defer p.lock.Unlock() | |||
There was a problem hiding this comment.
在这种性能极度敏感的库代码里尽量不要用 defer，它在汇编层面会有很多连锁调用导致性能损耗。直接在下面的 if err != nil {} 里面加一个解锁的步骤就行了。
There was a problem hiding this comment.
defer 在 1.14 基本已经没啥损耗了。另外即使是在老版本，大概率池子里运行的函数本身远重于 defer。这个池子本身的性能瓶颈也不会在这里。反倒是因为不用 defer，这已经是第二次碰到异常路径上没 unlock 的问题了。
panjf2000
changed the title
panjf2000
changed the title
panjf2000
approved these changes
Feb 26, 2020
|
@panjf2000 这种 case 不加单测么？ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
err!=nil时未释放锁，使用defer p.lock.Unlock()修复
name: Pull request
about: Propose changes to the code
title: ''
labels: ''
assignees: ''
1. Are you opening this pull request for bug-fixs, optimizations or new feature?
2. Please describe how these code changes achieve your intention.
3. Please link to the relevant issues (if any).
4. Which documentation changes (if any) need to be made/updated because of this PR?
4. Checklist