test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-11-29 18:27:58 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'V3.7' of https://github.com/goodrain/rainbond into V3.7

Browse Source
This commit is contained in:
barnettZQG 2018-10-18 12:19:13 +08:00
commit 6d225dc897
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
node/nodem/client/node.go
View File

@ -153,6 +153,7 @@ type NodeSystemInfo struct {
Architecture string `json:"architecture"`
MemorySize uint64 `json:"memorySize"`
NumCPU int64 `json:"cpu_num"`
}
//Decode decode node info

3
node/nodem/info/info_linux.go
View File

@ -45,6 +45,7 @@ func GetSystemInfo() (info client.NodeSystemInfo) {
}
info.OperatingSystem = runtime.GOOS
info.MemorySize, _ = getMemory()
info.NumCPU = int64(runtime.NumCPU())
return info
}
@ -72,7 +73,7 @@ func getMemory() (total uint64, free uint64) {
sysInfo := new(syscall.Sysinfo_t)
err := syscall.Sysinfo(sysInfo)
if err == nil {
return sysInfo.Totalram * uint64(syscall.Getpagesize()), sysInfo.Freeram * uint64(syscall.Getpagesize())
return uint64(sysInfo.Totalram) * uint64(sysInfo.Unit), sysInfo.Freeram * uint64(syscall.Getpagesize())
}
return 0, 0
}