Mon, 01 Dec 2014 18:22:45 +0400
8058935: CPU detection gives 0 cores per cpu, 2 threads per core in Amazon EC2 environment
Reviewed-by: kvn, dsamersoff
src/cpu/x86/vm/vm_version_x86.hpp | file | annotate | diff | comparison | revisions |
1.1 --- a/src/cpu/x86/vm/vm_version_x86.hpp Wed Dec 17 10:43:38 2014 -0800 1.2 +++ b/src/cpu/x86/vm/vm_version_x86.hpp Mon Dec 01 18:22:45 2014 +0400 1.3 @@ -570,10 +570,12 @@ 1.4 static uint cores_per_cpu() { 1.5 uint result = 1; 1.6 if (is_intel()) { 1.7 - if (supports_processor_topology()) { 1.8 + bool supports_topology = supports_processor_topology(); 1.9 + if (supports_topology) { 1.10 result = _cpuid_info.tpl_cpuidB1_ebx.bits.logical_cpus / 1.11 _cpuid_info.tpl_cpuidB0_ebx.bits.logical_cpus; 1.12 - } else { 1.13 + } 1.14 + if (!supports_topology || result == 0) { 1.15 result = (_cpuid_info.dcp_cpuid4_eax.bits.cores_per_cpu + 1); 1.16 } 1.17 } else if (is_amd()) {