Skip to content

add 'ps.lock.Unlock()' before return #16360

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 11, 2018
Merged

add 'ps.lock.Unlock()' before return #16360

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e436fb
add ps.lock.Unlock() before return
cpusoft Mar 22, 2018
e440ece
Merge pull request #1 from ethereum/master
cpusoft Mar 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions les/peer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,9 +545,11 @@ func (ps *peerSet) notify(n peerSetNotify) {
func (ps *peerSet) Register(p *peer) error {
ps.lock.Lock()
if ps.closed {
ps.lock.Unlock()
Copy link
Contributor

@niuzhenguo niuzhenguo Mar 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about using "defer ps.lock.Unlock()"?

Copy link
Contributor Author

@cpusoft cpusoft Mar 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have thought about it. but ps.lock.Unlock() should be called before "for _, n := range peers {" in 561 line .
or any other good way ?

Copy link
Contributor

@niuzhenguo niuzhenguo Mar 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, indeed.

return errClosed
}
if _, ok := ps.peers[p.id]; ok {
ps.lock.Unlock()
return errAlreadyRegistered
}
ps.peers[p.id] = p
Expand Down