mirrors/XTLS_REALITY
0
0
Fork 0
mirror of https://github.com/XTLS/REALITY.git synced 2025-08-22 22:48:36 +00:00
Code

crypto/tls: use runtime.AddCleanup instead of runtime.SetFinalizer

Browse Source 
Replace the usage of runtime.SetFinalizer with runtime.AddCleanup in
the certificate cache.

Updates #70907

Change-Id: Ieab6ff88dbc4083f11c1b475f11bd61521dbc638
Reviewed-on: https://go-review.googlesource.com/c/go/+/664275
Auto-Submit: Carlos Amedee <carlos@golang.org>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
This commit is contained in:
yuhan6665 2025-05-10 23:37:34 -04:00
parent 5b2edd4705
commit 69ea598173
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cache.go
View File

@ -43,15 +43,15 @@ var globalCertCache = new(certCache)
// activeCert is a handle to a certificate held in the cache. Once there are // activeCert is a handle to a certificate held in the cache. Once there are
// no alive activeCerts for a given certificate, the certificate is removed // no alive activeCerts for a given certificate, the certificate is removed
// from the cache by a finalizer. // from the cache by a cleanup.
type activeCert struct { type activeCert struct {
cert *x509.Certificate cert *x509.Certificate
} }
// active increments the number of references to the entry, wraps the // active increments the number of references to the entry, wraps the
// certificate in the entry in an activeCert, and sets the finalizer. // certificate in the entry in an activeCert, and sets the cleanup.
// //
// Note that there is a race between active and the finalizer set on the // Note that there is a race between active and the cleanup set on the
// returned activeCert, triggered if active is called after the ref count is // returned activeCert, triggered if active is called after the ref count is
// decremented such that refs may be > 0 when evict is called. We consider this // decremented such that refs may be > 0 when evict is called. We consider this
// safe, since the caller holding an activeCert for an entry that is no longer // safe, since the caller holding an activeCert for an entry that is no longer
@ -60,11 +60,11 @@ type activeCert struct {
func (cc *certCache) active(e *cacheEntry) *activeCert { func (cc *certCache) active(e *cacheEntry) *activeCert {
e.refs.Add(1) e.refs.Add(1)
a := &activeCert{e.cert} a := &activeCert{e.cert}
runtime.SetFinalizer(a, func(_ *activeCert) { runtime.AddCleanup(a, func(ce *cacheEntry) {
if e.refs.Add(-1) == 0 { if ce.refs.Add(-1) == 0 {
cc.evict(e) cc.evict(ce)
} }
}) }, e)
return a return a
} }