peer lock fixes

client.go

@@ -1106,12 +1106,12 @@ func (p *Peer) initUpdateRequestsTimer() {
 const peerUpdateRequestsTimerReason = "updateRequestsTimer"
 
 func (c *Peer) updateRequestsTimerFunc() {
-	c.locker().Lock()
-	defer c.locker().Unlock()
+	c.mu.Lock()
+	defer c.mu.Unlock()
 	if c.closed.IsSet() {
 		return
 	}
-	if c.isLowOnRequests() {
+	if c.isLowOnRequests(false) {
 		// If there are no outstanding requests, then a request update should have already run.
 		return
 	}
@@ -1121,7 +1121,7 @@ func (c *Peer) updateRequestsTimerFunc() {
 		torrent.Add("spurious timer requests updates", 1)
 		return
 	}
-	c.updateRequests(peerUpdateRequestsTimerReason)
+	c.updateRequests(peerUpdateRequestsTimerReason, false)
 }
 
 // Maximum pending requests we allow peers to send us. If peer requests are buffered on read, this

deferrwl.go

@@ -25,7 +25,7 @@ func stack(skip int) string {
 func (me *lockWithDeferreds) Lock() {
 	me.internal.Lock()
 	me.lc.Add(1)
-	// me.locker = stack(2)
+	//me.locker = stack(2)
 }
 
 func (me *lockWithDeferreds) Unlock() {

peer-impl.go

@@ -35,5 +35,5 @@ type peerImpl interface {
 	peerHasAllPieces() (all, known bool)
 	peerPieces() *roaring.Bitmap
 
-	nominalMaxRequests() maxRequests
+	nominalMaxRequests(lock bool) maxRequests
 }