OrgGo
/
shirou_gopsutil
mirror of https://hub.fastgit.org/shirou/gopsutil.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
shirou_gopsutil/cpu/cpu_solaris_test.go

156 lines
10 KiB
Go
Raw Normal View History

cpu: Implement Solaris support for Info() This commit adds Solaris(^1) support for the Info() function of package cpu, with the exception of the L2 cache size which is not trivially available(^2). Support is implemented by parsing the output of `isainfo -b -v` (for the instruction set flags), and `psr-info -p -v` for other information. Example outputs from a range of different size VMs and Joyent containers are included as part of the tests. (^1): This has only been tested with Illumos in the form of SmartOS. I believe it to be portable to other Illumos distributions but have not tested on Oracle Solaris. (^2): Enough support is added here to be usable for my port of HashiCorp's Nomad to SmartOS.
2017-03-12 04:54:02 +08:00
package cpu
import (
"io/ioutil"
"path/filepath"
"reflect"
"sort"
"testing"
)
func TestParseISAInfo(t *testing.T) {
cases := []struct {
filename string
expected []string
}{
{
"1cpu_1core_isainfo.txt",
gofumpt
2021-12-23 05:54:41 +08:00
[]string{
"rdseed", "adx", "avx2", "fma", "bmi2", "bmi1", "rdrand", "f16c", "vmx",
rename expected dir to testdata.
2017-03-15 22:01:06 +08:00
"avx", "xsave", "pclmulqdq", "aes", "movbe", "sse4.2", "sse4.1", "ssse3", "popcnt",
"tscp", "cx16", "sse3", "sse2", "sse", "fxsr", "mmx", "cmov", "amd_sysc", "cx8",
gofumpt
2021-12-23 05:54:41 +08:00
"tsc", "fpu",
},
cpu: Implement Solaris support for Info() This commit adds Solaris(^1) support for the Info() function of package cpu, with the exception of the L2 cache size which is not trivially available(^2). Support is implemented by parsing the output of `isainfo -b -v` (for the instruction set flags), and `psr-info -p -v` for other information. Example outputs from a range of different size VMs and Joyent containers are included as part of the tests. (^1): This has only been tested with Illumos in the form of SmartOS. I believe it to be portable to other Illumos distributions but have not tested on Oracle Solaris. (^2): Enough support is added here to be usable for my port of HashiCorp's Nomad to SmartOS.
2017-03-12 04:54:02 +08:00
},
{
"2cpu_1core_isainfo.txt",
gofumpt
2021-12-23 05:54:41 +08:00
[]string{
"rdseed", "adx", "avx2", "fma", "bmi2", "bmi1", "rdrand", "f16c", "vmx",
rename expected dir to testdata.
2017-03-15 22:01:06 +08:00
"avx", "xsave", "pclmulqdq", "aes", "movbe", "sse4.2", "sse4.1", "ssse3", "popcnt",
"tscp", "cx16", "sse3", "sse2", "sse", "fxsr", "mmx", "cmov", "amd_sysc", "cx8",
gofumpt
2021-12-23 05:54:41 +08:00
"tsc", "fpu",
},
cpu: Implement Solaris support for Info() This commit adds Solaris(^1) support for the Info() function of package cpu, with the exception of the L2 cache size which is not trivially available(^2). Support is implemented by parsing the output of `isainfo -b -v` (for the instruction set flags), and `psr-info -p -v` for other information. Example outputs from a range of different size VMs and Joyent containers are included as part of the tests. (^1): This has only been tested with Illumos in the form of SmartOS. I believe it to be portable to other Illumos distributions but have not tested on Oracle Solaris. (^2): Enough support is added here to be usable for my port of HashiCorp's Nomad to SmartOS.
2017-03-12 04:54:02 +08:00
},
{
"2cpu_8core_isainfo.txt",
gofumpt
2021-12-23 05:54:41 +08:00
[]string{
"vmx", "avx", "xsave", "pclmulqdq", "aes", "sse4.2", "sse4.1", "ssse3", "popcnt",
cpu: Implement Solaris support for Info() This commit adds Solaris(^1) support for the Info() function of package cpu, with the exception of the L2 cache size which is not trivially available(^2). Support is implemented by parsing the output of `isainfo -b -v` (for the instruction set flags), and `psr-info -p -v` for other information. Example outputs from a range of different size VMs and Joyent containers are included as part of the tests. (^1): This has only been tested with Illumos in the form of SmartOS. I believe it to be portable to other Illumos distributions but have not tested on Oracle Solaris. (^2): Enough support is added here to be usable for my port of HashiCorp's Nomad to SmartOS.
2017-03-12 04:54:02 +08:00
"tscp", "cx16", "sse3", "sse2", "sse", "fxsr", "mmx", "cmov", "amd_sysc", "cx8",
gofumpt
2021-12-23 05:54:41 +08:00
"tsc", "fpu",
},
cpu: Implement Solaris support for Info() This commit adds Solaris(^1) support for the Info() function of package cpu, with the exception of the L2 cache size which is not trivially available(^2). Support is implemented by parsing the output of `isainfo -b -v` (for the instruction set flags), and `psr-info -p -v` for other information. Example outputs from a range of different size VMs and Joyent containers are included as part of the tests. (^1): This has only been tested with Illumos in the form of SmartOS. I believe it to be portable to other Illumos distributions but have not tested on Oracle Solaris. (^2): Enough support is added here to be usable for my port of HashiCorp's Nomad to SmartOS.
2017-03-12 04:54:02 +08:00
},
[v2][cpu][solaris] psrinfo parsing fixes
2021-05-08 21:41:03 +08:00
{
"2cpu_12core_isainfo.txt",
gofumpt
2021-12-23 05:54:41 +08:00
[]string{
"amd_svm", "amd_lzcnt", "popcnt", "amd_sse4a", "tscp", "ahf", "cx16", "sse3", "sse2",
"sse", "fxsr", "amd_3dnowx", "amd_3dnow", "amd_mmx", "mmx", "cmov", "amd_sysc", "cx8", "tsc", "fpu",
},
[v2][cpu][solaris] psrinfo parsing fixes
2021-05-08 21:41:03 +08:00
},
cpu: Implement Solaris support for Info() This commit adds Solaris(^1) support for the Info() function of package cpu, with the exception of the L2 cache size which is not trivially available(^2). Support is implemented by parsing the output of `isainfo -b -v` (for the instruction set flags), and `psr-info -p -v` for other information. Example outputs from a range of different size VMs and Joyent containers are included as part of the tests. (^1): This has only been tested with Illumos in the form of SmartOS. I believe it to be portable to other Illumos distributions but have not tested on Oracle Solaris. (^2): Enough support is added here to be usable for my port of HashiCorp's Nomad to SmartOS.
2017-03-12 04:54:02 +08:00
}
for _, tc := range cases {
rename expected dir to testdata.
2017-03-15 22:01:06 +08:00
content, err := ioutil.ReadFile(filepath.Join("testdata", "solaris", tc.filename))
cpu: Implement Solaris support for Info() This commit adds Solaris(^1) support for the Info() function of package cpu, with the exception of the L2 cache size which is not trivially available(^2). Support is implemented by parsing the output of `isainfo -b -v` (for the instruction set flags), and `psr-info -p -v` for other information. Example outputs from a range of different size VMs and Joyent containers are included as part of the tests. (^1): This has only been tested with Illumos in the form of SmartOS. I believe it to be portable to other Illumos distributions but have not tested on Oracle Solaris. (^2): Enough support is added here to be usable for my port of HashiCorp's Nomad to SmartOS.
2017-03-12 04:54:02 +08:00
if err != nil {
t.Errorf("cannot read test case: %s", err)
}
sort.Strings(tc.expected)
flags, err := parseISAInfo(string(content))
if err != nil {
t.Fatalf("parseISAInfo: %s", err)
}
if !reflect.DeepEqual(tc.expected, flags) {
t.Fatalf("Bad flags\nExpected: %v\n Actual: %v", tc.expected, flags)
}
}
}
func TestParseProcessorInfo(t *testing.T) {
cases := []struct {
filename string
expected []InfoStat
}{
{
"1cpu_1core_psrinfo.txt",
[]InfoStat{
{CPU: 0, VendorID: "GenuineIntel", Family: "6", Model: "78", Stepping: 3, PhysicalID: "0", CoreID: "0", Cores: 1, ModelName: "Intel(r) Core(tm) i7-6567U CPU @ 3.30GHz", Mhz: 3312},
},
},
{
"2cpu_1core_psrinfo.txt",
[]InfoStat{
{CPU: 0, VendorID: "GenuineIntel", Family: "6", Model: "78", Stepping: 3, PhysicalID: "0", CoreID: "0", Cores: 1, ModelName: "Intel(r) Core(tm) i7-6567U CPU @ 3.30GHz", Mhz: 3312},
{CPU: 1, VendorID: "GenuineIntel", Family: "6", Model: "78", Stepping: 3, PhysicalID: "1", CoreID: "0", Cores: 1, ModelName: "Intel(r) Core(tm) i7-6567U CPU @ 3.30GHz", Mhz: 3312},
},
},
{
"2cpu_8core_psrinfo.txt",
[]InfoStat{
{CPU: 0, VendorID: "GenuineIntel", Family: "6", Model: "45", Stepping: 7, PhysicalID: "0", CoreID: "0", Cores: 2, ModelName: "Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz", Mhz: 2600},
{CPU: 1, VendorID: "GenuineIntel", Family: "6", Model: "45", Stepping: 7, PhysicalID: "0", CoreID: "1", Cores: 2, ModelName: "Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz", Mhz: 2600},
{CPU: 2, VendorID: "GenuineIntel", Family: "6", Model: "45", Stepping: 7, PhysicalID: "0", CoreID: "2", Cores: 2, ModelName: "Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz", Mhz: 2600},
{CPU: 3, VendorID: "GenuineIntel", Family: "6", Model: "45", Stepping: 7, PhysicalID: "0", CoreID: "3", Cores: 2, ModelName: "Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz", Mhz: 2600},
{CPU: 4, VendorID: "GenuineIntel", Family: "6", Model: "45", Stepping: 7, PhysicalID: "0", CoreID: "4", Cores: 2, ModelName: "Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz", Mhz: 2600},
{CPU: 5, VendorID: "GenuineIntel", Family: "6", Model: "45", Stepping: 7, PhysicalID: "0", CoreID: "5", Cores: 2, ModelName: "Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz", Mhz: 2600},
{CPU: 6, VendorID: "GenuineIntel", Family: "6", Model: "45", Stepping: 7, PhysicalID: "0", CoreID: "6", Cores: 2, ModelName: "Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz", Mhz: 2600},
{CPU: 7, VendorID: "GenuineIntel", Family: "6", Model: "45", Stepping: 7, PhysicalID: "0", CoreID: "7", Cores: 2, ModelName: "Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz", Mhz: 2600},
{CPU: 8, VendorID: "GenuineIntel", Family: "6", Model: "45", Stepping: 7, PhysicalID: "1", CoreID: "0", Cores: 2, ModelName: "Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz", Mhz: 2600},
{CPU: 9, VendorID: "GenuineIntel", Family: "6", Model: "45", Stepping: 7, PhysicalID: "1", CoreID: "1", Cores: 2, ModelName: "Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz", Mhz: 2600},
{CPU: 10, VendorID: "GenuineIntel", Family: "6", Model: "45", Stepping: 7, PhysicalID: "1", CoreID: "2", Cores: 2, ModelName: "Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz", Mhz: 2600},
{CPU: 11, VendorID: "GenuineIntel", Family: "6", Model: "45", Stepping: 7, PhysicalID: "1", CoreID: "3", Cores: 2, ModelName: "Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz", Mhz: 2600},
{CPU: 12, VendorID: "GenuineIntel", Family: "6", Model: "45", Stepping: 7, PhysicalID: "1", CoreID: "4", Cores: 2, ModelName: "Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz", Mhz: 2600},
{CPU: 13, VendorID: "GenuineIntel", Family: "6", Model: "45", Stepping: 7, PhysicalID: "1", CoreID: "5", Cores: 2, ModelName: "Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz", Mhz: 2600},
{CPU: 14, VendorID: "GenuineIntel", Family: "6", Model: "45", Stepping: 7, PhysicalID: "1", CoreID: "6", Cores: 2, ModelName: "Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz", Mhz: 2600},
{CPU: 15, VendorID: "GenuineIntel", Family: "6", Model: "45", Stepping: 7, PhysicalID: "1", CoreID: "7", Cores: 2, ModelName: "Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz", Mhz: 2600},
},
},
[v2][cpu][solaris] psrinfo parsing fixes
2021-05-08 21:41:03 +08:00
{
"2cpu_12core_psrinfo.txt",
[]InfoStat{
{CPU: 0, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "0", CoreID: "0", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 1, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "0", CoreID: "1", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 2, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "0", CoreID: "2", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 3, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "0", CoreID: "3", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 4, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "0", CoreID: "4", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 5, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "0", CoreID: "5", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 6, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "0", CoreID: "6", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 7, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "0", CoreID: "7", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 8, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "0", CoreID: "8", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 9, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "0", CoreID: "9", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 10, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "0", CoreID: "10", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 11, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "0", CoreID: "11", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 12, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "1", CoreID: "0", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 13, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "1", CoreID: "1", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 14, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "1", CoreID: "2", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 15, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "1", CoreID: "3", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 16, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "1", CoreID: "4", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 17, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "1", CoreID: "5", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 18, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "1", CoreID: "6", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 19, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "1", CoreID: "7", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 20, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "1", CoreID: "8", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 21, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "1", CoreID: "9", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 22, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "1", CoreID: "10", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
{CPU: 23, VendorID: "AuthenticAMD", Family: "16", Model: "9", Stepping: 1, PhysicalID: "1", CoreID: "11", Cores: 1, ModelName: "AMD Opteron(tm) Processor 6176\t[ Socket: G34 ]", Mhz: 2300},
},
},
cpu: Implement Solaris support for Info() This commit adds Solaris(^1) support for the Info() function of package cpu, with the exception of the L2 cache size which is not trivially available(^2). Support is implemented by parsing the output of `isainfo -b -v` (for the instruction set flags), and `psr-info -p -v` for other information. Example outputs from a range of different size VMs and Joyent containers are included as part of the tests. (^1): This has only been tested with Illumos in the form of SmartOS. I believe it to be portable to other Illumos distributions but have not tested on Oracle Solaris. (^2): Enough support is added here to be usable for my port of HashiCorp's Nomad to SmartOS.
2017-03-12 04:54:02 +08:00
}
for _, tc := range cases {
rename expected dir to testdata.
2017-03-15 22:01:06 +08:00
content, err := ioutil.ReadFile(filepath.Join("testdata", "solaris", tc.filename))
cpu: Implement Solaris support for Info() This commit adds Solaris(^1) support for the Info() function of package cpu, with the exception of the L2 cache size which is not trivially available(^2). Support is implemented by parsing the output of `isainfo -b -v` (for the instruction set flags), and `psr-info -p -v` for other information. Example outputs from a range of different size VMs and Joyent containers are included as part of the tests. (^1): This has only been tested with Illumos in the form of SmartOS. I believe it to be portable to other Illumos distributions but have not tested on Oracle Solaris. (^2): Enough support is added here to be usable for my port of HashiCorp's Nomad to SmartOS.
2017-03-12 04:54:02 +08:00
if err != nil {
t.Errorf("cannot read test case: %s", err)
}
cpus, err := parseProcessorInfo(string(content))
cpu: Check for error object
2018-06-21 22:42:49 +08:00
if err != nil {
t.Errorf("cannot parse processor info: %s", err)
}
cpu: Implement Solaris support for Info() This commit adds Solaris(^1) support for the Info() function of package cpu, with the exception of the L2 cache size which is not trivially available(^2). Support is implemented by parsing the output of `isainfo -b -v` (for the instruction set flags), and `psr-info -p -v` for other information. Example outputs from a range of different size VMs and Joyent containers are included as part of the tests. (^1): This has only been tested with Illumos in the form of SmartOS. I believe it to be portable to other Illumos distributions but have not tested on Oracle Solaris. (^2): Enough support is added here to be usable for my port of HashiCorp's Nomad to SmartOS.
2017-03-12 04:54:02 +08:00
if !reflect.DeepEqual(tc.expected, cpus) {
t.Fatalf("Bad Processor Info\nExpected: %v\n Actual: %v", tc.expected, cpus)
}
}
}