code clean

Author: silenceshell

cmd/topic/topic.go

@@ -29,16 +29,16 @@ func genSummary(stat *linuxproc.Stat) []string {
 	tc := pkg.GetTaskCount()
 	cpuCount := pkg.GetCpuCount(stat)
 	userCpu, systemCpu, idleCpu := pkg.GetCpuUsage(cpuCount)
-	totalMem, freeMem, usedMem, cacheMem := pkg.GetTotalMemInMiB()
-	avail := freeMem + cacheMem
+	memInfo := pkg.GetTotalMemInMiB()
+	avail := memInfo.Free + memInfo.Cache
 	return []string{
 		fmt.Sprintf("topic - %v up %s,  %d users,  load average: %s", currentTime, upTime, pkg.GetUsers(), loadMonitor.GetLoad()),
 		fmt.Sprintf("Tasks: [%3d](mod:bold) total, [%3d](mod:bold) running, [%3d](mod:bold) sleeping, [%3d](mod:bold) stopped, [%3d](mod:bold) zombie",
 			tc.Total, tc.Running, tc.Sleeping, tc.Stopped, tc.Zombie),
 		fmt.Sprintf("%%Cpu(%sc): [%2.1f](mod:bold) us, [%2.1f](mod:bold) sy,  [0.0](mod:bold) ni, [%2.1f](mod:bold) id,  [0.0](mod:bold) wa,  [0.0 hi,](mod:bold)  [0.0](mod:bold) si,  [0.0](mod:bold) st",
 			pkg.CpuCountToString(cpuCount), userCpu, systemCpu, idleCpu),
 		fmt.Sprintf("MiB Mem : [%7.1f](mod:bold) total, [%7.1f](mod:bold) free, [%7.1f](mod:bold) used, [%7.1f](mod:bold) buff/cache",
-			totalMem, freeMem, usedMem, cacheMem),
+			memInfo.Total, memInfo.Free, memInfo.Used, memInfo.Cache),
 		fmt.Sprintf("MiB Swap:       [0](mod:bold) total,       [0](mod:bold) free,       [0](mod:bold) used. [%7.1f](mod:bold) avail Mem", avail),
 	}
 }

pkg/memory.go

@@ -6,7 +6,11 @@ import (
 	v1 "github.com/containerd/cgroups/stats/v1"
 )
 
-func GetMemInfoInByte() (total, free, used, cache float64) {
+type MemInfo struct {
+	Total, Free, Used, Cache float64
+}
+
+func GetMemInfoInByte() (memInfo MemInfo) {
 	stats := v1.Metrics{}
 	mem := cgroups.NewMemory("/sys/fs/cgroup/", cgroups.IgnoreModules("memsw"))
 	err := mem.Stat("", &stats)
@@ -20,22 +24,31 @@ func GetMemInfoInByte() (total, free, used, cache float64) {
 	}
 
 	// convert Byte to MiB
+	var total float64
 	if stats.Memory.Usage.Limit/1024 > hostMemInfo.MemTotal {
 		total = float64(hostMemInfo.MemTotal) * 1024
 	} else {
 		total = float64(stats.Memory.Usage.Limit)
 	}
-	used = float64(stats.Memory.Usage.Usage)
-	cache = float64(stats.Memory.Cache)
-	free = total - used
-	return
+	used := float64(stats.Memory.Usage.Usage)
+	cache := float64(stats.Memory.Cache)
+	free := total - used
+	return MemInfo{Total: total, Free: free, Used: used, Cache: cache}
 }
 
-func GetTotalMemInMiB() (total, free, used, cache float64) {
-	total, free, used, cache = GetMemInfoInByte()
-	return total / 1048576, free / 1048576, used / 1048576, cache / 1048576
+func GetTotalMemInMiB() (memInfo MemInfo) {
+	memInfo = GetMemInfoInByte()
+	memInfo.Total = memInfo.Total / 1048576
+	memInfo.Free = memInfo.Free / 1048576
+	memInfo.Used = memInfo.Used / 1048576
+	memInfo.Cache = memInfo.Cache / 1048576
+	return memInfo
 }
-func GetTotalMemInKiB() (total, free, used, cache float64) {
-	total, free, used, cache = GetMemInfoInByte()
-	return total / 1024, free / 1024, used / 1024, cache / 1024
+func GetTotalMemInKiB() (memInfo MemInfo) {
+	memInfo = GetMemInfoInByte()
+	memInfo.Total = memInfo.Total / 1024
+	memInfo.Free = memInfo.Free / 1024
+	memInfo.Used = memInfo.Used / 1024
+	memInfo.Cache = memInfo.Cache / 1024
+	return memInfo
 }

pkg/tasks.go

@@ -103,7 +103,8 @@ func (t *TaskMonitor) GetTaskInfos() (infos []string) {
 		return
 	}
 
-	total, _, _, _ := GetTotalMemInKiB()
+	memInfo := GetTotalMemInKiB()
+	total := memInfo.Total
 
 	taskInfos := make([]string, 0)
 	for _, v := range files {