Commit5070c14

committed

netconn.go: Cleanup contexts on close

Updates#255

1 parent642a013 commit5070c14Copy full SHA for 5070c14

File tree

-4

lines changed

-4

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,8 @@ func NetConn(ctx context.Context, c *Conn, msgType MessageType) net.Conn {`
`50`	`50`	`writeMu:newMu(c),`
`51`	`51`	`}`
`52`	`52`
`53`		`-varwriteCancel context.CancelFunc`
`54`		`-nc.writeCtx,writeCancel=context.WithCancel(ctx)`
`55`		`-varreadCancel context.CancelFunc`
`56`		`-nc.readCtx,readCancel=context.WithCancel(ctx)`
	`53`	`+nc.writeCtx,nc.writeCancel=context.WithCancel(ctx)`
	`54`	`+nc.readCtx,nc.readCancel=context.WithCancel(ctx)`
`57`	`55`
`58`	`56`	`nc.writeTimer=time.AfterFunc(math.MaxInt64,func() {`
`59`	`57`	`if!nc.writeMu.tryLock() {`
`@@ -98,11 +96,13 @@ type netConn struct {`
`98`	`96`	`writeMu*mu`
`99`	`97`	`writeExpiredint64`
`100`	`98`	`writeCtx context.Context`
	`99`	`+writeCancel context.CancelFunc`
`101`	`100`
`102`	`101`	`readTimer*time.Timer`
`103`	`102`	`readMu*mu`
`104`	`103`	`readExpiredint64`
`105`	`104`	`readCtx context.Context`
	`105`	`+readCancel context.CancelFunc`
`106`	`106`	`readEOFedbool`
`107`	`107`	`reader io.Reader`
`108`	`108`	`}`
`@@ -111,7 +111,9 @@ var _ net.Conn = &netConn{}`
`111`	`111`
`112`	`112`	`func (nc*netConn)Close()error {`
`113`	`113`	`nc.writeTimer.Stop()`
	`114`	`+nc.writeCancel()`
`114`	`115`	`nc.readTimer.Stop()`
	`116`	`+nc.readCancel()`
`115`	`117`	`returnnc.c.Close(StatusNormalClosure,"")`
`116`	`118`	`}`
`117`	`119`

Comments

(0)