Mirrored_Repos/ctop
1
0
Fork 0
mirror of https://github.com/bcicen/ctop.git synced 2024-08-30 18:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

add secondary sort by name

Browse Source
This commit is contained in:
Bradley Cicenas
2017-02-23 01:32:35 +00:00
parent a1fdd8fb49
commit b529d41091
2 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
container.go
View File

@ -32,6 +32,7 @@ func (c *Container) SetState(s string) {
} }
func (c *Container) Collect() { func (c *Container) Collect() {
log.Infof("starting collector for container: %s", c.id)
c.collect.Start() c.collect.Start()
go func() { go func() {
for metrics := range c.collect.Stream() { for metrics := range c.collect.Stream() {

39
sort.go
View File

@ -9,13 +9,40 @@ import (
type sortMethod func(c1, c2 *Container) bool type sortMethod func(c1, c2 *Container) bool
func lessStr(s1, s2 string) bool { return s1 < s2 }
var idSorter = func(c1, c2 *Container) bool { return c1.id < c2.id }
var nameSorter = func(c1, c2 *Container) bool { return c1.name < c2.name }
var Sorters = map[string]sortMethod{ var Sorters = map[string]sortMethod{
"id": func(c1, c2 *Container) bool { return c1.id < c2.id }, "id": idSorter,
"name": func(c1, c2 *Container) bool { return c1.name < c2.name }, "name": nameSorter,
"cpu": func(c1, c2 *Container) bool { return c1.metrics.CPUUtil < c2.metrics.CPUUtil }, "cpu": func(c1, c2 *Container) bool {
"mem": func(c1, c2 *Container) bool { return c1.metrics.MemUsage < c2.metrics.MemUsage }, if c1.metrics.CPUUtil == c2.metrics.CPUUtil {
"mem %": func(c1, c2 *Container) bool { return c1.metrics.MemPercent < c2.metrics.MemPercent }, return nameSorter(c1, c2)
"net": func(c1, c2 *Container) bool { return sumNet(c1) < sumNet(c2) }, }
return c1.metrics.CPUUtil < c2.metrics.CPUUtil
},
"mem": func(c1, c2 *Container) bool {
if c1.metrics.MemUsage == c2.metrics.MemUsage {
return nameSorter(c1, c2)
}
return c1.metrics.MemUsage < c2.metrics.MemUsage
},
"mem %": func(c1, c2 *Container) bool {
if c1.metrics.MemPercent == c2.metrics.MemPercent {
return nameSorter(c1, c2)
}
return c1.metrics.MemPercent < c2.metrics.MemPercent
},
"net": func(c1, c2 *Container) bool {
sum1 := sumNet(c1)
sum2 := sumNet(c2)
if sum1 == sum2 {
return nameSorter(c1, c2)
}
return sum1 < sum2
},
"state": func(c1, c2 *Container) bool { "state": func(c1, c2 *Container) bool {
if c1.state == "running" { if c1.state == "running" {
return true return true