simplify starting of the dialWorkerLoop

marten-seemann · marten-seemann · commit 2f389ce389b8 · 2021-08-27T12:12:15.000+01:00
diff --git a/p2p/net/swarm/dial_sync.go b/p2p/net/swarm/dial_sync.go
@@ -93,7 +93,7 @@ func (ds *DialSync) getActiveDial(p peer.ID) (*activeDial, error) {
 			reqch:  make(chan dialRequest),
 			ds:     ds,
 		}
-		ds.dialWorker(p, actd.reqch)
+		go ds.dialWorker(p, actd.reqch)
 		ds.dials[p] = actd
 	}
 
diff --git a/p2p/net/swarm/swarm.go b/p2p/net/swarm/swarm.go
@@ -122,7 +122,7 @@ func NewSwarm(ctx context.Context, local peer.ID, peers peerstore.Peerstore, bwc
 		}
 	}
 
-	s.dsync = newDialSync(s.startDialWorker)
+	s.dsync = newDialSync(s.dialWorkerLoop)
 	s.limiter = newDialLimiter(s.dialAddr)
 	s.proc = goprocessctx.WithContext(ctx)
 	s.ctx = goprocessctx.OnClosingContext(s.proc)
diff --git a/p2p/net/swarm/swarm_dial.go b/p2p/net/swarm/swarm_dial.go
@@ -294,11 +294,7 @@ type dialResponse struct {
 	err  error
 }
 
-// startDialWorker starts an active dial goroutine that synchronizes and executes concurrent dials to a single peer
-func (s *Swarm) startDialWorker(p peer.ID, reqch <-chan dialRequest) {
-	go s.dialWorkerLoop(p, reqch)
-}
-
+// dialWorkerLoop synchronizes and executes concurrent dials to a single peer
 func (s *Swarm) dialWorkerLoop(p peer.ID, reqch <-chan dialRequest) {
 	defer s.limiter.clearAllPeerDials(p)
 

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func (ds DialSync) getActiveDial(p peer.ID) (activeDial, error) {`
`93`	`93`	`reqch: make(chan dialRequest),`
`94`	`94`	`ds: ds,`
`95`	`95`	`}`
`96`		`- ds.dialWorker(p, actd.reqch)`
	`96`	`+ go ds.dialWorker(p, actd.reqch)`
`97`	`97`	`ds.dials[p] = actd`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ func NewSwarm(ctx context.Context, local peer.ID, peers peerstore.Peerstore, bwc`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`125`		`- s.dsync = newDialSync(s.startDialWorker)`
	`125`	`+ s.dsync = newDialSync(s.dialWorkerLoop)`
`126`	`126`	`s.limiter = newDialLimiter(s.dialAddr)`
`127`	`127`	`s.proc = goprocessctx.WithContext(ctx)`
`128`	`128`	`s.ctx = goprocessctx.OnClosingContext(s.proc)`