vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Refactor stats and add them to all subsystems

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-04-20 12:02:39 -07:00
parent b5b44ad439
commit ab15aa234c
10 changed files with 88 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

84
cgroups/fs/cpuacct.go
View file

@ -2,7 +2,6 @@ package fs
import (
"bufio"
"fmt"
"io/ioutil"
"os"
"path/filepath"
@ -10,6 +9,7 @@ import (
"strings"
"github.com/dotcloud/docker/pkg/cgroups"
"github.com/dotcloud/docker/pkg/system"
)
type cpuacctGroup struct {
@ -28,62 +28,62 @@ func (s *cpuacctGroup) Remove(d *data) error {
}
func (s *cpuacctGroup) Stats(d *data) (map[string]float64, error) {
paramData := make(map[string]float64)
var (
uptime, startTime float64
paramData = make(map[string]float64)
cpuTotal = 0.0
)
path, err := d.path("cpuacct")
if err != nil {
return paramData, fmt.Errorf("Unable to read %s cgroup param: %s", path, err)
}
f, err := os.Open(filepath.Join(path, "cpuacct.stat"))
if err != nil {
return paramData, err
}
f, err := os.Open(filepath.Join(path, "cpuacct.stat"))
if err != nil {
return nil, err
}
defer f.Close()
sc := bufio.NewScanner(f)
cpuTotal := 0.0
for sc.Scan() {
t, v, err := getCgroupParamKeyValue(sc.Text())
if err != nil {
return paramData, fmt.Errorf("Error parsing param data: %s", err)
return paramData, err
}
// set the raw data in map
paramData[t] = v
cpuTotal += v
}
// calculate percentage from jiffies
// get sys uptime
uf, err := os.Open("/proc/uptime")
if err != nil {
return paramData, fmt.Errorf("Unable to open /proc/uptime")
if uptime, err = s.getUptime(); err != nil {
return nil, err
}
defer uf.Close()
uptimeData, err := ioutil.ReadAll(uf)
if err != nil {
return paramData, fmt.Errorf("Error reading /proc/uptime: %s", err)
if startTime, err = s.getProcStarttime(d); err != nil {
return nil, err
}
uptimeFields := strings.Fields(string(uptimeData))
uptime, err := strconv.ParseFloat(uptimeFields[0], 64)
if err != nil {
return paramData, fmt.Errorf("Error parsing cpu stats: %s", err)
}
// find starttime of process
pf, err := os.Open(filepath.Join(path, "cgroup.procs"))
if err != nil {
return paramData, fmt.Errorf("Error parsing cpu stats: %s", err)
}
defer pf.Close()
pr := bufio.NewReader(pf)
l, _, err := pr.ReadLine()
if err != nil {
return paramData, fmt.Errorf("Error reading param file: %s", err)
}
starttime, err := strconv.ParseFloat(string(l), 64)
if err != nil {
return paramData, fmt.Errorf("Unable to parse starttime: %s", err)
}
// get total elapsed seconds since proc start
seconds := uptime - (starttime / 100)
// finally calc percentage
cpuPercentage := 100.0 * ((cpuTotal / 100.0) / float64(seconds))
paramData["percentage"] = cpuPercentage
paramData["percentage"] = 100.0 * ((cpuTotal/100.0)/uptime - (startTime / 100))
return paramData, nil
}
func (s *cpuacctGroup) getUptime() (float64, error) {
f, err := os.Open("/proc/uptime")
if err != nil {
return 0, err
}
defer f.Close()
data, err := ioutil.ReadAll(f)
if err != nil {
return 0, err
}
return strconv.ParseFloat(strings.Fields(string(data))[0], 64)
}
func (s *cpuacctGroup) getProcStarttime(d *data) (float64, error) {
rawStart, err := system.GetProcessStartTime(d.pid)
if err != nil {
return 0, err
}
return strconv.ParseFloat(rawStart, 64)
}