Test

kylecarbs · kylecarbs · commit 4dddd0f167d5 · 2022-09-12T17:27:32.000-05:00
diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go
@@ -629,7 +629,9 @@ func (c *Conn) updateEndpoints(why string) {
 			}
 		}
 		c.endpointsUpdateActive = false
+		c.logf("goroutinesRunningLocked: broadcasting")
 		c.muCond.Broadcast()
+		c.logf("goroutinesRunningLocked: broadcasted")
 	}()
 	c.logf("[v1] magicsock: starting endpoint update (%s)", why)
 	if c.noV4Send.Load() && runtime.GOOS != "js" {
@@ -1402,7 +1404,9 @@ func (c *Conn) derpWriteChanOfAddr(addr netip.AddrPort, peer key.NodePublic) cha
 			c.mu.Lock()
 			defer c.mu.Unlock()
 			close(c.derpStarted)
+			c.logf("goroutinesRunningLocked: broadcasting firstDerp")
 			c.muCond.Broadcast()
+			c.logf("goroutinesRunningLocked: broadcasted firstDerp")
 		}()
 	}
 
@@ -2691,6 +2695,7 @@ func (c *Conn) Close() error {
 
 func (c *Conn) goroutinesRunningLocked() bool {
 	if c.endpointsUpdateActive {
+		c.logf("goroutinesRunningLocked: endpointsUpdateActive returning true")
 		return true
 	}
 	// The goroutine running dc.Connect in derpWriteChanOfAddr may linger
@@ -2706,6 +2711,7 @@ func (c *Conn) goroutinesRunningLocked() bool {
 		case <-c.derpStarted:
 			break
 		default:
+			c.logf("goroutinesRunningLocked: derpStarted returning true")
 			return true
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -629,7 +629,9 @@ func (c *Conn) updateEndpoints(why string) {`
`629`	`629`	`}`
`630`	`630`	`}`
`631`	`631`	`c.endpointsUpdateActive = false`
	`632`	`+ c.logf("goroutinesRunningLocked: broadcasting")`
`632`	`633`	`c.muCond.Broadcast()`
	`634`	`+ c.logf("goroutinesRunningLocked: broadcasted")`
`633`	`635`	`}()`
`634`	`636`	`c.logf("[v1] magicsock: starting endpoint update (%s)", why)`
`635`	`637`	`if c.noV4Send.Load() && runtime.GOOS != "js" {`
`@@ -1402,7 +1404,9 @@ func (c *Conn) derpWriteChanOfAddr(addr netip.AddrPort, peer key.NodePublic) cha`
`1402`	`1404`	`c.mu.Lock()`
`1403`	`1405`	`defer c.mu.Unlock()`
`1404`	`1406`	`close(c.derpStarted)`
	`1407`	`+ c.logf("goroutinesRunningLocked: broadcasting firstDerp")`
`1405`	`1408`	`c.muCond.Broadcast()`
	`1409`	`+ c.logf("goroutinesRunningLocked: broadcasted firstDerp")`
`1406`	`1410`	`}()`
`1407`	`1411`	`}`
`1408`	`1412`
`@@ -2691,6 +2695,7 @@ func (c *Conn) Close() error {`
`2691`	`2695`
`2692`	`2696`	`func (c *Conn) goroutinesRunningLocked() bool {`
`2693`	`2697`	`if c.endpointsUpdateActive {`
	`2698`	`+ c.logf("goroutinesRunningLocked: endpointsUpdateActive returning true")`
`2694`	`2699`	`return true`
`2695`	`2700`	`}`
`2696`	`2701`	`// The goroutine running dc.Connect in derpWriteChanOfAddr may linger`
`@@ -2706,6 +2711,7 @@ func (c *Conn) goroutinesRunningLocked() bool {`
`2706`	`2711`	`case <-c.derpStarted:`
`2707`	`2712`	`break`
`2708`	`2713`	`default:`
	`2714`	`+ c.logf("goroutinesRunningLocked: derpStarted returning true")`
`2709`	`2715`	`return true`
`2710`	`2716`	`}`
`2711`	`2717`	`}`