LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

[rpc mempool] Hide debugging functionality of dynamicMemUsage().

Browse source
This commit is contained in:
Jonathan Moody 2022-07-14 18:06:27 -04:00 committed by Roy Lee
parent abb1b8b388
commit a8a44aa988
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mempool/mempool.go
View file

@ -179,14 +179,14 @@ type TxDesc struct {
func (txD *TxDesc) incr(info *aggregateInfo) { func (txD *TxDesc) incr(info *aggregateInfo) {
info.totalCount += 1 info.totalCount += 1
info.totalBytes += int64(txD.Tx.MsgTx().SerializeSize()) info.totalBytes += int64(txD.Tx.MsgTx().SerializeSize())
info.totalMem += int64(dynamicMemUsage(reflect.ValueOf(txD), false, 0)) info.totalMem += int64(dynamicMemUsage(reflect.ValueOf(txD)))
info.totalFee += txD.Fee info.totalFee += txD.Fee
} }
func (txD *TxDesc) decr(info *aggregateInfo) { func (txD *TxDesc) decr(info *aggregateInfo) {
info.totalCount -= 1 info.totalCount -= 1
info.totalBytes -= int64(txD.Tx.MsgTx().SerializeSize()) info.totalBytes -= int64(txD.Tx.MsgTx().SerializeSize())
info.totalMem -= int64(dynamicMemUsage(reflect.ValueOf(txD), false, 0)) info.totalMem -= int64(dynamicMemUsage(reflect.ValueOf(txD)))
info.totalFee -= txD.Fee info.totalFee -= txD.Fee
} }
@ -202,13 +202,13 @@ type orphanTx struct {
func (otx *orphanTx) incr(info *aggregateInfo) { func (otx *orphanTx) incr(info *aggregateInfo) {
info.totalCount += 1 info.totalCount += 1
info.totalBytes += int64(otx.tx.MsgTx().SerializeSize()) info.totalBytes += int64(otx.tx.MsgTx().SerializeSize())
info.totalMem += int64(dynamicMemUsage(reflect.ValueOf(otx), true, 0)) info.totalMem += int64(dynamicMemUsage(reflect.ValueOf(otx)))
} }
func (otx *orphanTx) decr(info *aggregateInfo) { func (otx *orphanTx) decr(info *aggregateInfo) {
info.totalCount -= 1 info.totalCount -= 1
info.totalBytes -= int64(otx.tx.MsgTx().SerializeSize()) info.totalBytes -= int64(otx.tx.MsgTx().SerializeSize())
info.totalMem -= int64(dynamicMemUsage(reflect.ValueOf(otx), false, 0)) info.totalMem -= int64(dynamicMemUsage(reflect.ValueOf(otx)))
} }
// TxPool is used as a source of transactions that need to be mined into blocks // TxPool is used as a source of transactions that need to be mined into blocks

20
mempool/memusage.go
View file

@ -8,7 +8,11 @@ import (
"reflect" "reflect"
) )
func dynamicMemUsage(v reflect.Value, debug bool, level int) uintptr { func dynamicMemUsage(v reflect.Value) uintptr {
return _dynamicMemUsage(v, false, 0)
}
func _dynamicMemUsage(v reflect.Value, debug bool, level int) uintptr {
t := v.Type() t := v.Type()
bytes := t.Size() bytes := t.Size()
if debug { if debug {
@ -19,7 +23,7 @@ func dynamicMemUsage(v reflect.Value, debug bool, level int) uintptr {
switch t.Kind() { switch t.Kind() {
case reflect.Pointer, reflect.Interface: case reflect.Pointer, reflect.Interface:
if !v.IsNil() { if !v.IsNil() {
bytes += dynamicMemUsage(v.Elem(), debug, level+1) bytes += _dynamicMemUsage(v.Elem(), debug, level+1)
} }
case reflect.Array, reflect.Slice: case reflect.Array, reflect.Slice:
for j := 0; j < v.Len(); j++ { for j := 0; j < v.Len(); j++ {
@ -31,10 +35,10 @@ func dynamicMemUsage(v reflect.Value, debug bool, level int) uintptr {
elemB := uintptr(0) elemB := uintptr(0)
if t.Kind() == reflect.Array { if t.Kind() == reflect.Array {
if (k == reflect.Pointer || k == reflect.Interface) && !vi.IsNil() { if (k == reflect.Pointer || k == reflect.Interface) && !vi.IsNil() {
elemB += dynamicMemUsage(vi.Elem(), debug, level+1) elemB += _dynamicMemUsage(vi.Elem(), debug, level+1)
} }
} else { // slice } else { // slice
elemB += dynamicMemUsage(vi, debug, level+1) elemB += _dynamicMemUsage(vi, debug, level+1)
} }
if k == reflect.Uint8 { if k == reflect.Uint8 {
// short circuit for byte slice/array // short circuit for byte slice/array
@ -54,11 +58,11 @@ func dynamicMemUsage(v reflect.Value, debug bool, level int) uintptr {
if debug { if debug {
println("[", level, "] key:", vk.Type().Kind().String()) println("[", level, "] key:", vk.Type().Kind().String())
} }
bytes += dynamicMemUsage(vk, debug, level+1) bytes += _dynamicMemUsage(vk, debug, level+1)
if debug { if debug {
println("[", level, "] value:", vv.Type().Kind().String()) println("[", level, "] value:", vv.Type().Kind().String())
} }
bytes += dynamicMemUsage(vv, debug, level+1) bytes += _dynamicMemUsage(vv, debug, level+1)
if debug { if debug {
println("...", v.Len(), "map elements") println("...", v.Len(), "map elements")
} }
@ -72,10 +76,10 @@ func dynamicMemUsage(v reflect.Value, debug bool, level int) uintptr {
println("[", level, "] field:", f.Name, "kind:", k.String()) println("[", level, "] field:", f.Name, "kind:", k.String())
} }
if (k == reflect.Pointer || k == reflect.Interface) && !vf.IsNil() { if (k == reflect.Pointer || k == reflect.Interface) && !vf.IsNil() {
bytes += dynamicMemUsage(vf.Elem(), debug, level+1) bytes += _dynamicMemUsage(vf.Elem(), debug, level+1)
} else if k == reflect.Array || k == reflect.Slice { } else if k == reflect.Array || k == reflect.Slice {
bytes -= vf.Type().Size() bytes -= vf.Type().Size()
bytes += dynamicMemUsage(vf, debug, level+1) bytes += _dynamicMemUsage(vf, debug, level+1)
} }
} }
} }