-
Notifications
You must be signed in to change notification settings - Fork 493
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
expvar refactored to allow getting and deleting
- Loading branch information
1 parent
c39d89f
commit 0aab1d7
Showing
18 changed files
with
439 additions
and
242 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,245 @@ | ||
| // This package is a fork of the golang expvar expvar.Var types. | ||
| // Adding extra support for deleting and accessing raw typed values. | ||
| package expvar | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "expvar" | ||
| "fmt" | ||
| "math" | ||
| "sort" | ||
| "strconv" | ||
| "sync" | ||
| "sync/atomic" | ||
| ) | ||
|
|
||
| // Int is a 64-bit integer variable that satisfies the expvar.Var interface. | ||
| type Int struct { | ||
| i int64 | ||
| } | ||
|
|
||
| func (v *Int) String() string { | ||
| return strconv.FormatInt(v.Get(), 10) | ||
| } | ||
|
|
||
| func (v *Int) Add(delta int64) { | ||
| atomic.AddInt64(&v.i, delta) | ||
| } | ||
|
|
||
| func (v *Int) Set(value int64) { | ||
| atomic.StoreInt64(&v.i, value) | ||
| } | ||
|
|
||
| func (v *Int) Get() int64 { | ||
| return atomic.LoadInt64(&v.i) | ||
| } | ||
|
|
||
| // Float is a 64-bit float variable that satisfies the expvar.Var interface. | ||
| type Float struct { | ||
| f uint64 | ||
| } | ||
|
|
||
| func (v *Float) String() string { | ||
| return strconv.FormatFloat(v.Get(), 'g', -1, 64) | ||
| } | ||
|
|
||
| func (v *Float) Get() float64 { | ||
| return math.Float64frombits(atomic.LoadUint64(&v.f)) | ||
| } | ||
|
|
||
| // Add adds delta to v. | ||
| func (v *Float) Add(delta float64) { | ||
| for { | ||
| cur := atomic.LoadUint64(&v.f) | ||
| curVal := math.Float64frombits(cur) | ||
| nxtVal := curVal + delta | ||
| nxt := math.Float64bits(nxtVal) | ||
| if atomic.CompareAndSwapUint64(&v.f, cur, nxt) { | ||
| return | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Set sets v to value. | ||
| func (v *Float) Set(value float64) { | ||
| atomic.StoreUint64(&v.f, math.Float64bits(value)) | ||
| } | ||
|
|
||
| // MaxFloat is a 64-bit float variable that satisfies the expvar.Var interface. | ||
| // When setting a value it will only be set if it is greater than the current value. | ||
| type MaxFloat struct { | ||
| f uint64 | ||
| } | ||
|
|
||
| func (v *MaxFloat) String() string { | ||
| return strconv.FormatFloat(v.Get(), 'g', -1, 64) | ||
| } | ||
|
|
||
| func (v *MaxFloat) Get() float64 { | ||
| return math.Float64frombits(atomic.LoadUint64(&v.f)) | ||
| } | ||
|
|
||
| // Set sets v to value. | ||
| func (v *MaxFloat) Set(value float64) { | ||
| nxtBits := math.Float64bits(value) | ||
| for { | ||
| curBits := atomic.LoadUint64(&v.f) | ||
| cur := math.Float64frombits(curBits) | ||
| if value > cur { | ||
| if atomic.CompareAndSwapUint64(&v.f, curBits, nxtBits) { | ||
| return | ||
| } | ||
| } else { | ||
| return | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Map is a string-to-expvar.Var map variable that satisfies the expvar.Var interface. | ||
| type Map struct { | ||
| mu sync.RWMutex | ||
| m map[string]expvar.Var | ||
| keys []string // sorted | ||
| } | ||
|
|
||
| func (v *Map) String() string { | ||
| v.mu.RLock() | ||
| defer v.mu.RUnlock() | ||
| var b bytes.Buffer | ||
| fmt.Fprintf(&b, "{") | ||
| first := true | ||
| v.doLocked(func(kv expvar.KeyValue) { | ||
| if !first { | ||
| fmt.Fprintf(&b, ", ") | ||
| } | ||
| fmt.Fprintf(&b, "%q: %v", kv.Key, kv.Value) | ||
| first = false | ||
| }) | ||
| fmt.Fprintf(&b, "}") | ||
| return b.String() | ||
| } | ||
|
|
||
| func (v *Map) Init() *Map { | ||
| v.m = make(map[string]expvar.Var) | ||
| return v | ||
| } | ||
|
|
||
| // updateKeys updates the sorted list of keys in v.keys. | ||
| // must be called with v.mu held. | ||
| func (v *Map) updateKeys() { | ||
| if len(v.m) == len(v.keys) { | ||
| // No new key. | ||
| return | ||
| } | ||
| v.keys = v.keys[:0] | ||
| for k := range v.m { | ||
| v.keys = append(v.keys, k) | ||
| } | ||
| sort.Strings(v.keys) | ||
| } | ||
|
|
||
| func (v *Map) Get(key string) expvar.Var { | ||
| v.mu.RLock() | ||
| defer v.mu.RUnlock() | ||
| return v.m[key] | ||
| } | ||
|
|
||
| func (v *Map) Set(key string, av expvar.Var) { | ||
| v.mu.Lock() | ||
| defer v.mu.Unlock() | ||
| v.m[key] = av | ||
| v.updateKeys() | ||
| } | ||
|
|
||
| func (v *Map) Delete(key string) { | ||
| v.mu.Lock() | ||
| defer v.mu.Unlock() | ||
| delete(v.m, key) | ||
| v.updateKeys() | ||
| } | ||
|
|
||
| func (v *Map) Add(key string, delta int64) { | ||
| v.mu.RLock() | ||
| av, ok := v.m[key] | ||
| v.mu.RUnlock() | ||
| if !ok { | ||
| // check again under the write lock | ||
| v.mu.Lock() | ||
| av, ok = v.m[key] | ||
| if !ok { | ||
| av = new(Int) | ||
| v.m[key] = av | ||
| v.updateKeys() | ||
| } | ||
| v.mu.Unlock() | ||
| } | ||
|
|
||
| // Add to Int; ignore otherwise. | ||
| if iv, ok := av.(*Int); ok { | ||
| iv.Add(delta) | ||
| } | ||
| } | ||
|
|
||
| // AddFloat adds delta to the *Float value stored under the given map key. | ||
| func (v *Map) AddFloat(key string, delta float64) { | ||
| v.mu.RLock() | ||
| av, ok := v.m[key] | ||
| v.mu.RUnlock() | ||
| if !ok { | ||
| // check again under the write lock | ||
| v.mu.Lock() | ||
| av, ok = v.m[key] | ||
| if !ok { | ||
| av = new(Float) | ||
| v.m[key] = av | ||
| v.updateKeys() | ||
| } | ||
| v.mu.Unlock() | ||
| } | ||
|
|
||
| // Add to Float; ignore otherwise. | ||
| if iv, ok := av.(*Float); ok { | ||
| iv.Add(delta) | ||
| } | ||
| } | ||
|
|
||
| // Do calls f for each entry in the map. | ||
| // The map is locked during the iteration, | ||
| // but existing entries may be concurrently updated. | ||
| func (v *Map) Do(f func(expvar.KeyValue)) { | ||
| v.mu.RLock() | ||
| defer v.mu.RUnlock() | ||
| v.doLocked(f) | ||
| } | ||
|
|
||
| // doLocked calls f for each entry in the map. | ||
| // v.mu must be held for reads. | ||
| func (v *Map) doLocked(f func(expvar.KeyValue)) { | ||
| for _, k := range v.keys { | ||
| f(expvar.KeyValue{k, v.m[k]}) | ||
| } | ||
| } | ||
|
|
||
| // String is a string variable, and satisfies the expvar.Var interface. | ||
| type String struct { | ||
| mu sync.RWMutex | ||
| s string | ||
| } | ||
|
|
||
| func (v *String) String() string { | ||
| v.mu.RLock() | ||
| defer v.mu.RUnlock() | ||
| return strconv.Quote(v.s) | ||
| } | ||
|
|
||
| func (v *String) Set(value string) { | ||
| v.mu.Lock() | ||
| defer v.mu.Unlock() | ||
| v.s = value | ||
| } | ||
|
|
||
| func (v *String) Get() string { | ||
| v.mu.RLock() | ||
| defer v.mu.RUnlock() | ||
| return v.s | ||
| } |
Oops, something went wrong.