github-mirror/ctop
1
0
Fork 0
mirror of https://github.com/bcicen/ctop.git synced 2025-12-06 15:16:41 +08:00
Code Issues Projects Releases 1 Wiki Activity

Merge pull request #223 from stokito/trim

Browse Source 
file.go: remove duplicated trim
This commit is contained in:
bradley
2020-11-13 15:40:01 -05:00
committed by GitHub
parent 0bd8efe800 3a29c94833
commit 9aaba5dfca
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/file.go
View File

@@ -66,7 +66,7 @@ func Read() error {
for _, s := range strings.Split(colStr, ",") {
s = strings.TrimSpace(s)
if s != "" {
colNames = append(colNames, strings.TrimSpace(s))
colNames = append(colNames, s)
}
}
SetColumns(colNames)

4
connector/collector/docker.go
View File

@@ -86,9 +86,9 @@ func (c *Docker) ReadCPU(stats *api.Stats) {
syscpudiff := system - c.lastSysCpu
if c.scaleCpu {
c.CPUUtil = round((cpudiff / syscpudiff * 100))
c.CPUUtil = percent(cpudiff, syscpudiff)
} else {
c.CPUUtil = round((cpudiff / syscpudiff * 100) * ncpus)
c.CPUUtil = percent(ncpus*cpudiff, syscpudiff)
}
c.lastCpu = total
c.lastSysCpu = system

4
connector/collector/runc.go
View File

@@ -96,9 +96,9 @@ func (c *Runc) ReadCPU(stats *cgroups.Stats) {
syscpudiff := system - c.lastSysCpu
if c.scaleCpu {
c.CPUUtil = round((cpudiff / syscpudiff * 100))
c.CPUUtil = percent(cpudiff, syscpudiff)
} else {
c.CPUUtil = round((cpudiff / syscpudiff * 100) * ncpus)
c.CPUUtil = percent(ncpus*cpudiff, syscpudiff)
}
c.lastCpu = total
c.lastSysCpu = system