mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

expvar: use slices to simplify the code

This commit is contained in:
apocelipes 2024-04-04 01:43:23 +08:00
parent d8e47e257e
commit 5801b30dac
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/expvar/expvar.go
View File

@ -30,7 +30,7 @@ import (
"net/http"
"os"
"runtime"
"sort"
"slices"
"strconv"
"sync"
"sync/atomic"
@ -181,13 +181,11 @@ func (v *Map) addKey(key string) {
v.keysMu.Lock()
defer v.keysMu.Unlock()
// Using insertion sort to place key into the already-sorted v.keys.
if i := sort.SearchStrings(v.keys, key); i >= len(v.keys) {
v.keys = append(v.keys, key)
} else if v.keys[i] != key {
v.keys = append(v.keys, "")
copy(v.keys[i+1:], v.keys[i:])
v.keys[i] = key
i, found := slices.BinarySearch(v.keys, key)
if found {
return
}
v.keys = slices.Insert(v.keys, i, key)
}
func (v *Map) Get(key string) Var {
@ -248,10 +246,9 @@ func (v *Map) AddFloat(key string, delta float64) {
func (v *Map) Delete(key string) {
v.keysMu.Lock()
defer v.keysMu.Unlock()
i := sort.SearchStrings(v.keys, key)
if i < len(v.keys) && key == v.keys[i] {
v.keys = append(v.keys[:i], v.keys[i+1:]...)
v.m.Delete(key)
i, found := slices.BinarySearch(v.keys, key)
if found {
v.keys = slices.Delete(v.keys, i, i+1)
}
}
@ -318,7 +315,7 @@ func Publish(name string, v Var) {
vars.keysMu.Lock()
defer vars.keysMu.Unlock()
vars.keys = append(vars.keys, name)
sort.Strings(vars.keys)
slices.Sort(vars.keys)
}
// Get retrieves a named exported variable. It returns nil if the name has