Commit 9b590a9

committed

net: using runtime.AddCleanup

1 parent a8564bd commit 9b590a9Copy full SHA for 9b590a9

File tree

-4

lines changed

-4

lines changed

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ type netFD struct {`
`24`	`24`	`net string`
`25`	`25`	`laddr Addr`
`26`	`26`	`raddr Addr`
	`27`	`+ cleanup runtime.Cleanup`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`func (fd *netFD) name() string {`
`@@ -40,13 +41,13 @@ func (fd *netFD) name() string {`
`40`	`41`	`func (fd *netFD) setAddr(laddr, raddr Addr) {`
`41`	`42`	`fd.laddr = laddr`
`42`	`43`	`fd.raddr = raddr`
`43`		`- // TODO Replace with runtime.AddCleanup.`
`44`		`- runtime.SetFinalizer(fd, (*netFD).Close)`
	`44`	`+ fd.cleanup = runtime.AddCleanup(fd, func(pfd poll.FD) {`
	`45`	`+ _ = pfd.Close()`
	`46`	`+ }, fd.pfd)`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`func (fd *netFD) Close() error {`
`48`		`- // TODO Replace with runtime.AddCleanup.`
`49`		`- runtime.SetFinalizer(fd, nil)`
	`50`	`+ fd.cleanup.Stop()`
`50`	`51`	`return fd.pfd.Close()`
`51`	`52`	`}`
`52`	`53`

Comments

(0)