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

Merge pull request #803 from vmarmol/mem-limit

Browse Source 
Lower threshold for "unlimited".
This commit is contained in:
Rohit Jnagal 2015-07-07 08:52:52 -07:00
commit 44f86044e1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pages/containers.go
View File

@ -18,7 +18,6 @@ package pages
import ( import (
"fmt" "fmt"
"html/template" "html/template"
"math"
"net/http" "net/http"
"net/url" "net/url"
"path" "path"
@ -149,15 +148,19 @@ func toMegabytes(bytes uint64) float64 {
return float64(bytes) / (1 << 20) return float64(bytes) / (1 << 20)
} }
// Size after which we consider memory to be "unlimited". This is not
// MaxInt64 due to rounding by the kernel.
const maxMemorySize = uint64(1 << 62)
func printSize(bytes uint64) string { func printSize(bytes uint64) string {
if bytes >= math.MaxInt64 { if bytes >= maxMemorySize {
return "unlimited" return "unlimited"
} }
return ByteSize(bytes).Size() return ByteSize(bytes).Size()
} }
func printUnit(bytes uint64) string { func printUnit(bytes uint64) string {
if bytes >= math.MaxInt64 { if bytes >= maxMemorySize {
return "" return ""
} }
return ByteSize(bytes).Unit() return ByteSize(bytes).Unit()