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

add pids, IO stat

Browse Source
This commit is contained in:
f1yegor
2017-03-12 02:35:40 +01:00
parent d5ef818c8d
commit dbaebe0192
9 changed files with 126 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cwidgets/compact/header.go
View File

@@ -12,7 +12,7 @@ type CompactHeader struct {
}
func NewCompactHeader() *CompactHeader {
fields := []string{"", "NAME", "CID", "CPU", "MEM", "NET RX/TX"}
fields := []string{"", "NAME", "CID", "CPU", "MEM", "NET RX/TX", "IO Read/Write", "Pids"}
ch := &CompactHeader{}
ch.Height = 2
for _, f := range fields {
@@ -27,7 +27,7 @@ func (ch *CompactHeader) GetHeight() int {
func (ch *CompactHeader) SetWidth(w int) {
x := ch.X
autoWidth := calcWidth(w, 5)
autoWidth := calcWidth(w, 7)
for n, col := range ch.pars {
// set status column to static width
if n == 0 {

15
cwidgets/compact/main.go
View File

@@ -15,6 +15,8 @@ type Compact struct {
Cpu *GaugeCol
Memory *GaugeCol
Net *TextCol
IO *TextCol
Pids *TextCol
X, Y int
Width int
Height int
@@ -32,6 +34,8 @@ func NewCompact(id string) *Compact {
Cpu: NewGaugeCol(),
Memory: NewGaugeCol(),
Net: NewTextCol("-"),
IO: NewTextCol("-"),
Pids: NewTextCol("-"),
X: 1,
Height: 1,
}
@@ -59,6 +63,8 @@ func (row *Compact) SetMetrics(m metrics.Metrics) {
row.SetCPU(m.CPUUtil)
row.SetNet(m.NetRx, m.NetTx)
row.SetMem(m.MemUsage, m.MemLimit, m.MemPercent)
row.SetIO(m.IOBytesRead, m.IOBytesWrite)
row.SetPids(m.Pids)
}
// Set gauges, counters to default unread values
@@ -66,6 +72,8 @@ func (row *Compact) Reset() {
row.Cpu.Reset()
row.Memory.Reset()
row.Net.Reset()
row.IO.Reset()
row.Pids.Reset()
}
func (row *Compact) GetHeight() int {
@@ -91,7 +99,7 @@ func (row *Compact) SetWidth(width int) {
return
}
x := row.X
autoWidth := calcWidth(width, 5)
autoWidth := calcWidth(width, 7)
for n, col := range row.all() {
// set status column to static width
if n == 0 {
@@ -116,7 +124,8 @@ func (row *Compact) Buffer() ui.Buffer {
buf.Merge(row.Cpu.Buffer())
buf.Merge(row.Memory.Buffer())
buf.Merge(row.Net.Buffer())
buf.Merge(row.IO.Buffer())
buf.Merge(row.Pids.Buffer())
return buf
}
@@ -128,5 +137,7 @@ func (row *Compact) all() []ui.GridBufferer {
row.Cpu,
row.Memory,
row.Net,
row.IO,
row.Pids,
}
}

10
cwidgets/compact/setters.go
View File

@@ -13,6 +13,16 @@ func (row *Compact) SetNet(rx int64, tx int64) {
row.Net.Set(label)
}
func (row *Compact) SetIO(read int64, write int64) {
label := fmt.Sprintf("%s / %s", cwidgets.ByteFormat(read), cwidgets.ByteFormat(write))
row.IO.Set(label)
}
func (row *Compact) SetPids(val int) {
label := fmt.Sprintf("%s", strconv.Itoa(val))
row.Pids.Set(label)
}
func (row *Compact) SetCPU(val int) {
row.Cpu.BarColor = colorScale(val)
row.Cpu.Label = fmt.Sprintf("%s%%", strconv.Itoa(val))