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

Merge pull request #15380 from calavera/remove_sys_info_pointers

Browse source 
Remove pointers from the SysInfo struct.
This commit is contained in:
Alexandre Beslic 2015-08-17 18:40:54 -07:00
commit f192bc6f68
2 changed files with 43 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sysinfo/sysinfo.go
View file

@ -6,10 +6,10 @@ type SysInfo struct {
// Whether the kernel supports AppArmor or not // Whether the kernel supports AppArmor or not
AppArmor bool AppArmor bool
*cgroupMemInfo cgroupMemInfo
*cgroupCPUInfo cgroupCPUInfo
*cgroupBlkioInfo cgroupBlkioInfo
*cgroupCpusetInfo cgroupCpusetInfo
// Whether IPv4 forwarding is supported or not, if this was disabled, networking will not work // Whether IPv4 forwarding is supported or not, if this was disabled, networking will not work
IPv4ForwardingDisabled bool IPv4ForwardingDisabled bool

71
sysinfo/sysinfo_linux.go
View file

@ -35,89 +35,96 @@ func New(quiet bool) *SysInfo {
return sysInfo return sysInfo
} }
func checkCgroupMem(quiet bool) *cgroupMemInfo { // checkCgroupMem reads the memory information from the memory cgroup mount point.
info := &cgroupMemInfo{} func checkCgroupMem(quiet bool) cgroupMemInfo {
mountPoint, err := cgroups.FindCgroupMountpoint("memory") mountPoint, err := cgroups.FindCgroupMountpoint("memory")
if err != nil { if err != nil {
if !quiet { if !quiet {
logrus.Warnf("Your kernel does not support cgroup memory limit: %v", err) logrus.Warnf("Your kernel does not support cgroup memory limit: %v", err)
} }
return info return cgroupMemInfo{}
} }
info.MemoryLimit = true
info.SwapLimit = cgroupEnabled(mountPoint, "memory.memsw.limit_in_bytes") swapLimit := cgroupEnabled(mountPoint, "memory.memsw.limit_in_bytes")
if !quiet && !info.SwapLimit { if !quiet && !swapLimit {
logrus.Warn("Your kernel does not support swap memory limit.") logrus.Warn("Your kernel does not support swap memory limit.")
} }
info.OomKillDisable = cgroupEnabled(mountPoint, "memory.oom_control") oomKillDisable := cgroupEnabled(mountPoint, "memory.oom_control")
if !quiet && !info.OomKillDisable { if !quiet && !oomKillDisable {
logrus.Warnf("Your kernel does not support oom control.") logrus.Warnf("Your kernel does not support oom control.")
} }
info.MemorySwappiness = cgroupEnabled(mountPoint, "memory.swappiness") memorySwappiness := cgroupEnabled(mountPoint, "memory.swappiness")
if !quiet && !info.MemorySwappiness { if !quiet && !memorySwappiness {
logrus.Warnf("Your kernel does not support memory swappiness.") logrus.Warnf("Your kernel does not support memory swappiness.")
} }
return info return cgroupMemInfo{
MemoryLimit: true,
SwapLimit: swapLimit,
OomKillDisable: oomKillDisable,
MemorySwappiness: memorySwappiness,
}
} }
func checkCgroupCPU(quiet bool) *cgroupCPUInfo { // checkCgroupCPU reads the cpu information from the cpu cgroup mount point.
info := &cgroupCPUInfo{} func checkCgroupCPU(quiet bool) cgroupCPUInfo {
mountPoint, err := cgroups.FindCgroupMountpoint("cpu") mountPoint, err := cgroups.FindCgroupMountpoint("cpu")
if err != nil { if err != nil {
if !quiet { if !quiet {
logrus.Warn(err) logrus.Warn(err)
} }
return info return cgroupCPUInfo{}
} }
info.CPUShares = cgroupEnabled(mountPoint, "cpu.shares") cpuShares := cgroupEnabled(mountPoint, "cpu.shares")
if !quiet && !info.CPUShares { if !quiet && !cpuShares {
logrus.Warn("Your kernel does not support cgroup cpu shares") logrus.Warn("Your kernel does not support cgroup cpu shares")
} }
info.CPUCfsPeriod = cgroupEnabled(mountPoint, "cpu.cfs_period_us") cpuCfsPeriod := cgroupEnabled(mountPoint, "cpu.cfs_period_us")
if !quiet && !info.CPUCfsPeriod { if !quiet && !cpuCfsPeriod {
logrus.Warn("Your kernel does not support cgroup cfs period") logrus.Warn("Your kernel does not support cgroup cfs period")
} }
info.CPUCfsQuota = cgroupEnabled(mountPoint, "cpu.cfs_quota_us") cpuCfsQuota := cgroupEnabled(mountPoint, "cpu.cfs_quota_us")
if !quiet && !info.CPUCfsQuota { if !quiet && !cpuCfsQuota {
logrus.Warn("Your kernel does not support cgroup cfs quotas") logrus.Warn("Your kernel does not support cgroup cfs quotas")
} }
return info return cgroupCPUInfo{
CPUShares: cpuShares,
CPUCfsPeriod: cpuCfsPeriod,
CPUCfsQuota: cpuCfsQuota,
}
} }
func checkCgroupBlkioInfo(quiet bool) *cgroupBlkioInfo { // checkCgroupBlkioInfo reads the blkio information from the blkio cgroup mount point.
info := &cgroupBlkioInfo{} func checkCgroupBlkioInfo(quiet bool) cgroupBlkioInfo {
mountPoint, err := cgroups.FindCgroupMountpoint("blkio") mountPoint, err := cgroups.FindCgroupMountpoint("blkio")
if err != nil { if err != nil {
if !quiet { if !quiet {
logrus.Warn(err) logrus.Warn(err)
} }
return info return cgroupBlkioInfo{}
} }
info.BlkioWeight = cgroupEnabled(mountPoint, "blkio.weight") w := cgroupEnabled(mountPoint, "blkio.weight")
if !quiet && !info.BlkioWeight { if !quiet && !w {
logrus.Warn("Your kernel does not support cgroup blkio weight") logrus.Warn("Your kernel does not support cgroup blkio weight")
} }
return info return cgroupBlkioInfo{BlkioWeight: w}
} }
func checkCgroupCpusetInfo(quiet bool) *cgroupCpusetInfo { // checkCgroupCpusetInfo reads the cpuset information from the cpuset cgroup mount point.
info := &cgroupCpusetInfo{} func checkCgroupCpusetInfo(quiet bool) cgroupCpusetInfo {
_, err := cgroups.FindCgroupMountpoint("cpuset") _, err := cgroups.FindCgroupMountpoint("cpuset")
if err != nil { if err != nil {
if !quiet { if !quiet {
logrus.Warn(err) logrus.Warn(err)
} }
return info return cgroupCpusetInfo{}
} }
info.Cpuset = true return cgroupCpusetInfo{Cpuset: true}
return info
} }
func cgroupEnabled(mountPoint, name string) bool { func cgroupEnabled(mountPoint, name string) bool {