@@ -40,7 +40,13 @@ int main(int argc, char * *argv) /* hyperthreads, cores, or truly physical CPUs. */ /* */ /* If the Physical and Logical counts are equal, the number of Physical/Logical is the */ - /* core count, because it's a dual core system. */ + /* core count, because it's a multi-core system. */ + /* */ + /* If a count of the processor packages is needed, simply divide VirtualCount */ + /* by LogicalPerPackage to get the number. This may fail in some situations where */ + /* the OS or a HyperVisor (VMWare or HyperV) limit the number of processors the OS */ + /* sees - the CPU hardware will still report the total number of cores it has, but */ + /* the underlying software will not have access to it. */ console->WriteLine("There are %d processors in the system (%d cores per package, %d logical per package).", cpuid->VirtualCount(), @@ -71,7 +77,7 @@ int main(int argc, char * *argv) if ((int)ratio < 1) { console->WriteLine(); console->SetColour(console->FG_YELLOW | console->FG_INTENSITY); - console->WriteLine("WARNING: Expected at least 1 physical package, but detected %0.1lf. Are you\n" + console->WriteLine("WARNING: Expected at least 1 physical package, but detected %0.2lf. Are you\n" "running this under a hypervisor?", ratio); console->SetColour(); } examples/CPUID/main.cpp @@ -1081,10 +1081,10 @@ namespace CrissCross if (proc[processor]->m_cores > 1 && proc[processor]->m_logical > proc[processor]->m_cores) { - /* Hyperthreaded dual core. */ + /* Hyperthreaded core. */ } else if (proc[processor]->m_cores > 1 && proc[processor]->m_logical == proc[processor]->m_cores) { - /* Dual core. */ + /* Multi-core processor not presenting HTT */ proc[processor]->m_features.erase("HTT"); } else if (proc[processor]->m_cores == 1 && proc[processor]->m_logical > proc[processor]->m_cores) { @@ -1092,8 +1092,9 @@ namespace CrissCross proc[processor]->m_features.erase("CMP"); } } else { - /* HTT not supported. Report logical processor count as 1. */ - proc[processor]->m_logical = 1; + /* HTT not supported. Report cores and logical processor count as equal. */ + proc[processor]->m_cores = (char)(((Std[4].eax & 0xFC000000) >> 26) + 1); + proc[processor]->m_logical = proc[processor]->m_cores; } } source/cpuid.cpp 050ccffc41c55f33f0ff1c3643d4d61737369c2a Dan Linder dan@linder.org http://github.com/tycho/crisscross/commit/f4c7122ce18e31289dc213ac3d9750ce6b879955 f4c7122ce18e31289dc213ac3d9750ce6b879955 2009-10-22T13:33:23-07:00 2009-10-22T13:33:23-07:00 Update code for older non-HTT cpus to correctly report the number of cores and logical processors. Also update in-line comments to better explain how to determine physical cpu count strategy. f069cd6da63a923b9117eb81860f415c25c99aa3 Dan Linder dan@linder.org