No more zombie processes

[godwmstat.git] / main.go

diff --git a/main.go b/main.go
index a9be080519e3e3d536fd6433f8e3cadb1629da83..fb515303436ef7ad2ecaf8b4b702db29bd561edf 100644 (file)
--- a/main.go
+++ b/main.go
@@ -43,12 +43,9 @@ func piper(c chan []string, name string, args ...string) error {
                        c <- cols
                }
        }
-       if err = scanner.Err(); err != nil {
-               cmd.Process.Kill()
-               cmd.Wait()
-               return err
-       }
-       return nil
+       cmd.Process.Kill()
+       cmd.Wait()
+       return scanner.Err()
 }
 
 func bg(cmd string, args ...string) chan []string {
@@ -126,11 +123,15 @@ func netstat() {
 
 func freq() {
        for cols := range bg("sysctl", "-n", "dev.cpu.0.freq") {
-               raw, err := strconv.Atoi(cols[0])
-               if err != nil {
-                       continue
+               if strings.HasSuffix(cols[0], "01") {
+                       Freq = "TB"
+               } else {
+                       raw, err := strconv.Atoi(cols[0])
+                       if err != nil {
+                               continue
+                       }
+                       Freq = fmt.Sprintf("%.1fG", float64(raw)/1000)
                }
-               Freq = fmt.Sprintf("%.1fG", float64(raw)/1000)
        }
 }