From 6ce1332d3cac5b74d2f049861f04cc2fa282d747 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 29 Dec 2022 23:53:55 -0700 Subject: cmd/btrfs-rec inspect rebuild-nodes: Optimize memory use --- lib/textui/log_memstats.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/textui') diff --git a/lib/textui/log_memstats.go b/lib/textui/log_memstats.go index 6e3c3a1..7ef35da 100644 --- a/lib/textui/log_memstats.go +++ b/lib/textui/log_memstats.go @@ -19,14 +19,14 @@ type LiveMemUse struct { var _ fmt.Stringer = (*LiveMemUse)(nil) -var liveMemUseUpdateInterval = Tunable(1 * time.Second) +var LiveMemUseUpdateInterval = Tunable(1 * time.Second) func (o *LiveMemUse) String() string { o.mu.Lock() // runtime.ReadMemStats() calls stopTheWorld(), so we want to // rate-limit how often we call it. - if now := time.Now(); now.Sub(o.last) > liveMemUseUpdateInterval { + if now := time.Now(); now.Sub(o.last) > LiveMemUseUpdateInterval { runtime.ReadMemStats(&o.stats) o.last = now } -- cgit v1.2.3-2-g168b From e18c0e92ba35bb863f7375b190b0448d5fa65d33 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 30 Dec 2022 21:52:57 -0700 Subject: rebuildnodes/btrees: Allow item rbtrees to be evicted --- lib/textui/log.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'lib/textui') diff --git a/lib/textui/log.go b/lib/textui/log.go index 801e9eb..da303dd 100644 --- a/lib/textui/log.go +++ b/lib/textui/log.go @@ -317,18 +317,22 @@ func fieldOrd(key string) int { return -25 // step=rebuild (any substep) case "btrfsinspect.rebuild-nodes.rebuild.want.key": - return -7 + return -9 case "btrfsinspect.rebuild-nodes.rebuild.want.reason": - return -6 + return -8 case "btrfsinspect.rebuild-nodes.rebuild.add-tree": - return -5 + return -7 case "btrfsinspect.rebuild-nodes.rebuild.add-tree.substep": - return -4 + return -6 case "btrfsinspect.rebuild-nodes.rebuild.add-tree.want.key": - return -3 + return -5 case "btrfsinspect.rebuild-nodes.rebuild.add-tree.want.reason": - return -2 + return -4 case "btrfsinspect.rebuild-nodes.rebuild.add-root": + return -3 + case "btrfsinspect.rebuild-nodes.rebuild.index-inc-items": + return -2 + case "btrfsinspect.rebuild-nodes.rebuild.index-all-items": return -1 // other /////////////////////////////////////////////////////////////// -- cgit v1.2.3-2-g168b From b1a69c59fdfbdb43de7f8ab949cfed19fcef6387 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 31 Dec 2022 12:03:51 -0700 Subject: textui: Add doc comments for LiveMemUse --- lib/textui/log_memstats.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'lib/textui') diff --git a/lib/textui/log_memstats.go b/lib/textui/log_memstats.go index 7ef35da..31d526f 100644 --- a/lib/textui/log_memstats.go +++ b/lib/textui/log_memstats.go @@ -11,6 +11,13 @@ import ( "time" ) +// LiveMemUse is an object that stringifies as the live memory use of +// the program. +// +// It is intended to be used with dlog by attaching it as a field, so +// that all log lines include the current memory use: +// +// ctx = dlog.WithField(ctx, "mem", new(textui.LiveMemUse)) type LiveMemUse struct { mu sync.Mutex stats runtime.MemStats @@ -19,8 +26,13 @@ type LiveMemUse struct { var _ fmt.Stringer = (*LiveMemUse)(nil) +// LiveMemUseUpdateInterval is the shortest interval on which +// LiveMemUse is willing to update; we have this minimum interval +// because it stops the world to collect memory statistics, so we +// don't want to be updating the statistics too often. var LiveMemUseUpdateInterval = Tunable(1 * time.Second) +// String implements fmt.Stringer. func (o *LiveMemUse) String() string { o.mu.Lock() -- cgit v1.2.3-2-g168b From a433371680b2e01a5fdf05b342c9c4d9f8c3cc20 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 31 Dec 2022 13:15:07 -0700 Subject: rebuildnodes/btrees: Allow leaf-node indexes to be evicted --- lib/textui/log.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/textui') diff --git a/lib/textui/log.go b/lib/textui/log.go index da303dd..8327b67 100644 --- a/lib/textui/log.go +++ b/lib/textui/log.go @@ -322,17 +322,17 @@ func fieldOrd(key string) int { return -8 case "btrfsinspect.rebuild-nodes.rebuild.add-tree": return -7 - case "btrfsinspect.rebuild-nodes.rebuild.add-tree.substep": - return -6 case "btrfsinspect.rebuild-nodes.rebuild.add-tree.want.key": - return -5 + return -6 case "btrfsinspect.rebuild-nodes.rebuild.add-tree.want.reason": - return -4 + return -5 case "btrfsinspect.rebuild-nodes.rebuild.add-root": - return -3 + return -4 case "btrfsinspect.rebuild-nodes.rebuild.index-inc-items": - return -2 + return -3 case "btrfsinspect.rebuild-nodes.rebuild.index-all-items": + return -2 + case "btrfsinspect.rebuild-nodes.rebuild.index-nodes": return -1 // other /////////////////////////////////////////////////////////////// -- cgit v1.2.3-2-g168b From df62eb5d4c92756914ce57a1b6219b39876331f6 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 3 Jan 2023 10:34:06 -0700 Subject: Try to get log-lines to be shorter --- lib/textui/log.go | 3 ++- lib/textui/log_test.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/textui') diff --git a/lib/textui/log.go b/lib/textui/log.go index 8327b67..110e1aa 100644 --- a/lib/textui/log.go +++ b/lib/textui/log.go @@ -180,7 +180,7 @@ func (l *logger) log(lvl dlog.LogLevel, writeMsg func(io.Writer)) { // time //////////////////////////////////////////////////////////////// now := time.Now() - const timeFmt = "2006-01-02 15:04:05.0000" + const timeFmt = "15:04:05.0000" logBuf.WriteString(timeFmt) now.AppendFormat(logBuf.Bytes()[:0], timeFmt) @@ -372,6 +372,7 @@ func writeField(w io.Writer, key string, val any) { if strings.HasPrefix(valStr, "/main/") { valStr = strings.TrimPrefix(valStr, "/main") } + valStr = strings.TrimPrefix(valStr, "/") } case strings.HasSuffix(name, ".pass"): fmt.Fprintf(w, "/pass-%s", valStr) diff --git a/lib/textui/log_test.go b/lib/textui/log_test.go index 514d96e..bcd9c39 100644 --- a/lib/textui/log_test.go +++ b/lib/textui/log_test.go @@ -16,7 +16,7 @@ import ( ) func logLineRegexp(inner string) string { - return `[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{4} ` + inner + ` \(from lib/textui/log_test\.go:[0-9]+\)\n` + return `[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{4} ` + inner + ` \(from lib/textui/log_test\.go:[0-9]+\)\n` } func TestLogFormat(t *testing.T) { -- cgit v1.2.3-2-g168b