prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use uint64 for Memory Stats

Browse Source
This commit is contained in:
Hubert Krauze 2016-01-20 08:46:42 +01:00
parent 9b26a06688
commit 7d053578d4
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
info/v1/machine.go
View File

@ -136,7 +136,7 @@ type MachineInfo struct {
CpuFrequency uint64 `json:"cpu_frequency_khz"` CpuFrequency uint64 `json:"cpu_frequency_khz"`
// The amount of memory (in bytes) in this machine // The amount of memory (in bytes) in this machine
MemoryCapacity int64 `json:"memory_capacity"` MemoryCapacity uint64 `json:"memory_capacity"`
// The machine id // The machine id
MachineID string `json:"machine_id"` MachineID string `json:"machine_id"`

2
info/v2/machine.go
View File

@ -41,7 +41,7 @@ type Attributes struct {
CpuFrequency uint64 `json:"cpu_frequency_khz"` CpuFrequency uint64 `json:"cpu_frequency_khz"`
// The amount of memory (in bytes) in this machine // The amount of memory (in bytes) in this machine
MemoryCapacity int64 `json:"memory_capacity"` MemoryCapacity uint64 `json:"memory_capacity"`
// The machine id // The machine id
MachineID string `json:"machine_id"` MachineID string `json:"machine_id"`

16
utils/machine/machine.go
View File

@ -82,8 +82,8 @@ func GetClockSpeed(procInfo []byte) (uint64, error) {
} }
// GetMachineMemoryCapacity returns the machine's total memory from /proc/meminfo. // GetMachineMemoryCapacity returns the machine's total memory from /proc/meminfo.
// Returns the total memory capacity as an int64 (number of bytes). // Returns the total memory capacity as an uint64 (number of bytes).
func GetMachineMemoryCapacity() (int64, error) { func GetMachineMemoryCapacity() (uint64, error) {
out, err := ioutil.ReadFile("/proc/meminfo") out, err := ioutil.ReadFile("/proc/meminfo")
if err != nil { if err != nil {
return 0, err return 0, err
@ -97,8 +97,8 @@ func GetMachineMemoryCapacity() (int64, error) {
} }
// GetMachineSwapCapacity returns the machine's total swap from /proc/meminfo. // GetMachineSwapCapacity returns the machine's total swap from /proc/meminfo.
// Returns the total swap capacity as an int64 (number of bytes). // Returns the total swap capacity as an uint64 (number of bytes).
func GetMachineSwapCapacity() (int64, error) { func GetMachineSwapCapacity() (uint64, error) {
out, err := ioutil.ReadFile("/proc/meminfo") out, err := ioutil.ReadFile("/proc/meminfo")
if err != nil { if err != nil {
return 0, err return 0, err
@ -113,14 +113,14 @@ func GetMachineSwapCapacity() (int64, error) {
// parseCapacity matches a Regexp in a []byte, returning the resulting value in bytes. // parseCapacity matches a Regexp in a []byte, returning the resulting value in bytes.
// Assumes that the value matched by the Regexp is in KB. // Assumes that the value matched by the Regexp is in KB.
func parseCapacity(b []byte, r *regexp.Regexp) (int64, error) { func parseCapacity(b []byte, r *regexp.Regexp) (uint64, error) {
matches := r.FindSubmatch(b) matches := r.FindSubmatch(b)
if len(matches) != 2 { if len(matches) != 2 {
return -1, fmt.Errorf("failed to match regexp in output: %q", string(b)) return 0, fmt.Errorf("failed to match regexp in output: %q", string(b))
} }
m, err := strconv.ParseInt(string(matches[1]), 10, 64) m, err := strconv.ParseUint(string(matches[1]), 10, 64)
if err != nil { if err != nil {
return -1, err return 0, err
} }
// Convert to bytes. // Convert to bytes.