OrgGo/gotop
1
0
Fork 0
mirror of https://github.com/cjbassi/gotop.git synced 2025-04-27 13:48:54 +08:00
Code Issues Projects Releases Wiki Activity

Fix inability to display command names with whitespace in MacOS

Browse Source 
Co-authored-by: Fiona Thompson <fionabronwen@gmail.com>
This commit is contained in:
whuang8 2019-02-09 16:43:09 -06:00
parent 9e7f58b769
commit 60b913a93e
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/widgets/proc_other.go
View File

@ -10,6 +10,13 @@ import (
"strings" "strings"
) )
const (
// Define column widths for ps output used in Processes()
five = "12345"
ten = five + five
fifty = ten + ten + ten + ten + ten
)
func (self *Proc) update() { func (self *Proc) update() {
processes, err := Processes() processes, err := Processes()
if err != nil { if err != nil {
@ -29,33 +36,35 @@ func (self *Proc) update() {
} }
func Processes() ([]Process, error) { func Processes() ([]Process, error) {
output, err := exec.Command("ps", "-wwcaxo", "pid,comm,pcpu,pmem,args").Output() keywords := fmt.Sprintf("pid=%s,comm=%s,pcpu=%s,pmem=%s,args", ten, fifty, five, five)
output, err := exec.Command("ps", "-wwcaxo", keywords).Output()
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to execute 'ps' command: %v", err) return nil, fmt.Errorf("failed to execute 'ps' command: %v", err)
} }
// converts to []string and removes the header // converts to []string and removes the header
strOutput := strings.Split(strings.TrimSpace(string(output)), "\n")[1:] strOutput := strings.Split(strings.TrimSpace(string(output)), "\n")[1:]
processes := []Process{} processes := []Process{}
for _, line := range strOutput { for _, line := range strOutput {
split := strings.Fields(line) pid, err := strconv.Atoi(strings.TrimSpace(line[0:10]))
pid, err := strconv.Atoi(split[0])
if err != nil { if err != nil {
log.Printf("failed to convert first field to int: %v. split: %v", err, split) log.Printf("failed to convert first field to int: %v. split: %v", err, line)
} }
cpu, err := strconv.ParseFloat(split[2], 64) cpu, err := strconv.ParseFloat(strings.TrimSpace(line[63:68]), 64)
if err != nil { if err != nil {
log.Printf("failed to convert third field to float: %v. split: %v", err, split) log.Printf("failed to convert third field to float: %v. split: %v", err, line)
} }
mem, err := strconv.ParseFloat(split[3], 64) mem, err := strconv.ParseFloat(strings.TrimSpace(line[69:74]), 64)
if err != nil { if err != nil {
log.Printf("failed to convert fourth field to float: %v. split: %v", err, split) log.Printf("failed to convert fourth field to float: %v. split: %v", err, line)
} }
process := Process{ process := Process{
PID: pid, PID: pid,
Command: split[1], Command: strings.TrimSpace(line[11:61]),
CPU: cpu, CPU: cpu,
Mem: mem, Mem: mem,
Args: strings.Join(split[4:], " "), Args: line[74:],
} }
processes = append(processes, process) processes = append(processes, process)
} }