From 0eacb9b9c80f2d8486004a11ea0c8f5bae3cb085 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Tue, 17 Aug 2021 15:07:32 +0300 Subject: [PATCH 1/2] call string.Repeat always with positive int --- cmd/lotus-miner/sealing.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/cmd/lotus-miner/sealing.go b/cmd/lotus-miner/sealing.go index 75f02845ce2..e4ee7e14d92 100644 --- a/cmd/lotus-miner/sealing.go +++ b/cmd/lotus-miner/sealing.go @@ -101,17 +101,27 @@ var sealingWorkersCmd = &cli.Command{ ramBarsRes := int(stat.Info.Resources.MemReserved * barCols / stat.Info.Resources.MemPhysical) ramBarsUsed := int(stat.MemUsedMin * barCols / stat.Info.Resources.MemPhysical) - ramBar := color.YellowString(strings.Repeat("|", ramBarsRes)) + - color.GreenString(strings.Repeat("|", ramBarsUsed)) + - strings.Repeat(" ", int(barCols)-ramBarsUsed-ramBarsRes) + ramRepeatSpace := int(barCols) - (ramBarsUsed + ramBarsRes) + var ramBar string + if ramRepeatSpace < 0 { + ramRepeatSpace = 0 + ramBar = color.RedString(strings.Repeat("|", ramBarsRes)) + + color.GreenString(strings.Repeat("|", ramBarsUsed)) + + strings.Repeat(" ", ramRepeatSpace) + } else { + ramBar = color.YellowString(strings.Repeat("|", ramBarsRes)) + + color.GreenString(strings.Repeat("|", ramBarsUsed)) + + strings.Repeat(" ", ramRepeatSpace) + } vmem := stat.Info.Resources.MemPhysical + stat.Info.Resources.MemSwap vmemBarsRes := int(stat.Info.Resources.MemReserved * barCols / vmem) vmemBarsUsed := int(stat.MemUsedMax * barCols / vmem) + vmemRepeatSpace := int(barCols) - (vmemBarsUsed + vmemBarsRes) vmemBar := color.YellowString(strings.Repeat("|", vmemBarsRes)) + color.GreenString(strings.Repeat("|", vmemBarsUsed)) + - strings.Repeat(" ", int(barCols)-vmemBarsUsed-vmemBarsRes) + strings.Repeat(" ", vmemRepeatSpace) fmt.Printf("\tRAM: [%s] %d%% %s/%s\n", ramBar, (stat.Info.Resources.MemReserved+stat.MemUsedMin)*100/stat.Info.Resources.MemPhysical, From 548865e8dd50b732eb1ca6239623079374cbe056 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Wed, 25 Aug 2021 11:48:03 +0300 Subject: [PATCH 2/2] simplify assignments to vmemBar and ramBar --- cmd/lotus-miner/sealing.go | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/cmd/lotus-miner/sealing.go b/cmd/lotus-miner/sealing.go index e4ee7e14d92..a7e0a8de8dd 100644 --- a/cmd/lotus-miner/sealing.go +++ b/cmd/lotus-miner/sealing.go @@ -102,24 +102,30 @@ var sealingWorkersCmd = &cli.Command{ ramBarsRes := int(stat.Info.Resources.MemReserved * barCols / stat.Info.Resources.MemPhysical) ramBarsUsed := int(stat.MemUsedMin * barCols / stat.Info.Resources.MemPhysical) ramRepeatSpace := int(barCols) - (ramBarsUsed + ramBarsRes) - var ramBar string + + colorFunc := color.YellowString if ramRepeatSpace < 0 { ramRepeatSpace = 0 - ramBar = color.RedString(strings.Repeat("|", ramBarsRes)) + - color.GreenString(strings.Repeat("|", ramBarsUsed)) + - strings.Repeat(" ", ramRepeatSpace) - } else { - ramBar = color.YellowString(strings.Repeat("|", ramBarsRes)) + - color.GreenString(strings.Repeat("|", ramBarsUsed)) + - strings.Repeat(" ", ramRepeatSpace) + colorFunc = color.RedString } + ramBar := colorFunc(strings.Repeat("|", ramBarsRes)) + + color.GreenString(strings.Repeat("|", ramBarsUsed)) + + strings.Repeat(" ", ramRepeatSpace) + vmem := stat.Info.Resources.MemPhysical + stat.Info.Resources.MemSwap vmemBarsRes := int(stat.Info.Resources.MemReserved * barCols / vmem) vmemBarsUsed := int(stat.MemUsedMax * barCols / vmem) vmemRepeatSpace := int(barCols) - (vmemBarsUsed + vmemBarsRes) - vmemBar := color.YellowString(strings.Repeat("|", vmemBarsRes)) + + + colorFunc = color.YellowString + if vmemRepeatSpace < 0 { + vmemRepeatSpace = 0 + colorFunc = color.RedString + } + + vmemBar := colorFunc(strings.Repeat("|", vmemBarsRes)) + color.GreenString(strings.Repeat("|", vmemBarsUsed)) + strings.Repeat(" ", vmemRepeatSpace)