Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-10-19 19:13:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

net: use runtime.AddCleanup instead of runtime.SetFinalizer

Browse source 
Adds TODO for replacement of runtime.SetFinalizer.

Fixes #70907

Change-Id: Ic009018a93ccc46a776ae34afac44635d2340cbf
Reviewed-on: https://go-review.googlesource.com/c/go/+/638557
Reviewed-by: Damien Neil <dneil@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Carlos Amedee <carlos@golang.org>
This commit is contained in:
Carlos Amedee 2024-12-23 11:52:43 -05:00 • committed by Gopher Robot
parent 68f4434df0
commit 8cb0941a85
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/net/fd_fake.go
View file

@ -104,6 +104,7 @@ func (fd *netFD) accept() (netfd *netFD, err error) {
func (fd *netFD) setAddr(laddr, raddr Addr) { func (fd *netFD) setAddr(laddr, raddr Addr) {
fd.laddr = laddr fd.laddr = laddr
fd.raddr = raddr fd.raddr = raddr
// TODO Replace with runtime.AddCleanup.
runtime.SetFinalizer(fd, (*netFD).Close) runtime.SetFinalizer(fd, (*netFD).Close)
} }
@ -111,6 +112,7 @@ func (fd *netFD) Close() error {
if fd.fakeNetFD != nil { if fd.fakeNetFD != nil {
return fd.fakeNetFD.Close() return fd.fakeNetFD.Close()
} }
// TODO Replace with runtime.AddCleanup.
runtime.SetFinalizer(fd, nil) runtime.SetFinalizer(fd, nil)
return fd.pfd.Close() return fd.pfd.Close()
} }

2
src/net/fd_posix.go
View file

@ -40,10 +40,12 @@ func (fd *netFD) name() string {
func (fd *netFD) setAddr(laddr, raddr Addr) { func (fd *netFD) setAddr(laddr, raddr Addr) {
fd.laddr = laddr fd.laddr = laddr
fd.raddr = raddr fd.raddr = raddr
// TODO Replace with runtime.AddCleanup.
runtime.SetFinalizer(fd, (*netFD).Close) runtime.SetFinalizer(fd, (*netFD).Close)
} }
func (fd *netFD) Close() error { func (fd *netFD) Close() error {
// TODO Replace with runtime.AddCleanup.
runtime.SetFinalizer(fd, nil) runtime.SetFinalizer(fd, nil)
return fd.pfd.Close() return fd.pfd.Close()
} }