From 8cb0941a85de6ddbd6f49f8e7dc2dd3caeeee61c Mon Sep 17 00:00:00 2001 From: Carlos Amedee Date: Mon, 23 Dec 2024 11:52:43 -0500 Subject: [PATCH] net: use runtime.AddCleanup instead of runtime.SetFinalizer 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 LUCI-TryBot-Result: Go LUCI Auto-Submit: Carlos Amedee --- src/net/fd_fake.go | 2 ++ src/net/fd_posix.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/net/fd_fake.go b/src/net/fd_fake.go index ae567acc69..946805ab94 100644 --- a/src/net/fd_fake.go +++ b/src/net/fd_fake.go @@ -104,6 +104,7 @@ func (fd *netFD) accept() (netfd *netFD, err error) { func (fd *netFD) setAddr(laddr, raddr Addr) { fd.laddr = laddr fd.raddr = raddr + // TODO Replace with runtime.AddCleanup. runtime.SetFinalizer(fd, (*netFD).Close) } @@ -111,6 +112,7 @@ func (fd *netFD) Close() error { if fd.fakeNetFD != nil { return fd.fakeNetFD.Close() } + // TODO Replace with runtime.AddCleanup. runtime.SetFinalizer(fd, nil) return fd.pfd.Close() } diff --git a/src/net/fd_posix.go b/src/net/fd_posix.go index 93e6b5378e..023cd534e4 100644 --- a/src/net/fd_posix.go +++ b/src/net/fd_posix.go @@ -40,10 +40,12 @@ func (fd *netFD) name() string { func (fd *netFD) setAddr(laddr, raddr Addr) { fd.laddr = laddr fd.raddr = raddr + // TODO Replace with runtime.AddCleanup. runtime.SetFinalizer(fd, (*netFD).Close) } func (fd *netFD) Close() error { + // TODO Replace with runtime.AddCleanup. runtime.SetFinalizer(fd, nil) return fd.pfd.Close() } -- 2.51.0