get CLOCK TICK by using getconf.

shirou · Jul 17, 2015 · 8c17a75 · 8c17a75 · gwind · Jul 18, 2015
1 parent 06a4ba7
commit 8c17a75
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 9 deletions.
diff --git a/cpu/cpu_darwin.go b/cpu/cpu_darwin.go
@@ -21,10 +21,18 @@ const (
 	CPUStates = 5
 )
 
-// time.h
-const (
-	ClocksPerSec = 128
-)
+var ClocksPerSec = float64(128)
+
+func init() {
+	out, err := exec.Command("/usr/bin/getconf", "CLK_TCK").Output()
+	// ignore errors
+	if err == nil {
+		i, err := strconv.ParseFloat(string(out), 64)
+		if err == nil {
+			ClocksPerSec = float64(i)
+		}
+	}
+}
 
 func CPUTimes(percpu bool) ([]CPUTimesStat, error) {
 	var ret []CPUTimesStat

diff --git a/cpu/cpu_freebsd.go b/cpu/cpu_freebsd.go
@@ -4,6 +4,7 @@ package cpu
 
 import (
 	"fmt"
+	"os/exec"
 	"regexp"
 	"strconv"
 	"strings"
@@ -21,10 +22,18 @@ const (
 	CPUStates = 5
 )
 
-// time.h
-const (
-	ClocksPerSec = 128
-)
+var ClocksPerSec = float64(128)
+
+func init() {
+	out, err := exec.Command("/usr/bin/getconf", "CLK_TCK").Output()
+	// ignore errors
+	if err == nil {
+		i, err := strconv.ParseFloat(string(out), 64)
+		if err == nil {
+			ClocksPerSec = float64(i)
+		}
+	}
+}
 
 func CPUTimes(percpu bool) ([]CPUTimesStat, error) {
 	var ret []CPUTimesStat

diff --git a/cpu/cpu_linux.go b/cpu/cpu_linux.go
@@ -4,12 +4,26 @@ package cpu
 
 import (
 	"errors"
+	"os/exec"
 	"strconv"
 	"strings"
 
 	common "github.com/shirou/gopsutil/common"
 )
 
+var cpu_tick = float64(100)
+
+func init() {
+	out, err := exec.Command("/usr/bin/getconf", "CLK_TCK").Output()
+	// ignore errors
+	if err == nil {
+		i, err := strconv.ParseFloat(string(out), 64)
+		if err == nil {
+			cpu_tick = float64(i)
+		}
+	}
+}
+
 func CPUTimes(percpu bool) ([]CPUTimesStat, error) {
 	filename := "/proc/stat"
 	var lines = []string{}
@@ -151,7 +165,6 @@ func parseStatLine(line string) (*CPUTimesStat, error) {
 		return nil, err
 	}
 
-	cpu_tick := float64(100) // TODO: how to get _SC_CLK_TCK ?
 	ct := &CPUTimesStat{
 		CPU:     cpu,
 		User:    float64(user) / cpu_tick,