Skip to content

minimize peermanager lock scope #860

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
Feb 28, 2025
Merged

minimize peermanager lock scope #860

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8dd49c
minimize peermanager lock scope
gammazero Feb 28, 2025
b01091a
Merge branch 'main' into min-pm-lock
gammazero Feb 28, 2025
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
15 changes: 8 additions & 7 deletions bitswap/client/internal/peermanager/peermanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,35 +82,36 @@ func (pm *PeerManager) ConnectedPeers() []peer.ID {
// of wants.
func (pm *PeerManager) Connected(p peer.ID) {
pm.pqLk.Lock()
defer pm.pqLk.Unlock()

pq := pm.getOrCreate(p)

// Inform the peer want manager that there's a new peer
pm.pwm.addPeer(pq, p)

pm.pqLk.Unlock()

// Inform the sessions that the peer has connected
pm.signalAvailability(p, true)
}

// Disconnected is called to remove a peer from the pool.
func (pm *PeerManager) Disconnected(p peer.ID) {
pm.pqLk.Lock()
defer pm.pqLk.Unlock()

pq, ok := pm.peerQueues[p]

if !ok {
pm.pqLk.Unlock()
return
}
// Clean up the peer
delete(pm.peerQueues, p)
pm.pwm.removePeer(p)

pm.pqLk.Unlock()

// Inform the sessions that the peer has disconnected
pm.signalAvailability(p, false)

// Clean up the peer
delete(pm.peerQueues, p)
pq.Shutdown()
pm.pwm.removePeer(p)
}

// ResponseReceived is called when a message is received from the network.
Expand Down
Loading