kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG:cpuinfo format are different between Linux and Cygwin. Cygwin does not have physical id tag or cpu cores tag.

Browse Source
This commit is contained in:
Francois Bertel 2008-06-01 14:40:11 -04:00
parent fc5bc3380e
commit d0237abfd4
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/kwsys/SystemInformation.cxx
View File

@ -218,7 +218,7 @@ protected:
unsigned int IsHyperThreadingSupported(); unsigned int IsHyperThreadingSupported();
LongLong GetCyclesDifference(DELAY_FUNC, unsigned int); LongLong GetCyclesDifference(DELAY_FUNC, unsigned int);
// For Linux // For Linux and Cygwin, /proc/cpuinfo formats are slightly different
int RetreiveInformationFromCpuInfoFile(); int RetreiveInformationFromCpuInfoFile();
kwsys_stl::string ExtractValueFromCpuInfoFile(kwsys_stl::string buffer, kwsys_stl::string ExtractValueFromCpuInfoFile(kwsys_stl::string buffer,
const char* word, size_t init=0); const char* word, size_t init=0);
@ -2168,6 +2168,7 @@ int SystemInformationImplementation::RetreiveInformationFromCpuInfoFile()
pos = buffer.find("processor\t",pos+1); pos = buffer.find("processor\t",pos+1);
} }
#ifdef __linux
// Find the largest physical id. // Find the largest physical id.
int maxId = -1; int maxId = -1;
kwsys_stl::string idc = kwsys_stl::string idc =
@ -2185,15 +2186,18 @@ int SystemInformationImplementation::RetreiveInformationFromCpuInfoFile()
// Physical ids returned by Linux don't distinguish cores. // Physical ids returned by Linux don't distinguish cores.
// We want to record the total number of cores in this->NumberOfPhysicalCPU // We want to record the total number of cores in this->NumberOfPhysicalCPU
// (checking only the first proc) // (checking only the first proc)
kwsys_stl::string cores = kwsys_stl::string cores =
this->ExtractValueFromCpuInfoFile(buffer,"cpu cores"); this->ExtractValueFromCpuInfoFile(buffer,"cpu cores");
int numberOfCoresPerCPU=atoi(cores.c_str()); int numberOfCoresPerCPU=atoi(cores.c_str());
this->NumberOfPhysicalCPU=numberOfCoresPerCPU*(maxId+1); this->NumberOfPhysicalCPU=numberOfCoresPerCPU*(maxId+1);
// have to have one, and need to avoid divied by zero
if(this->NumberOfPhysicalCPU <= 0) #else // __CYGWIN__
{ // does not have "physical id" entries, neither "cpu cores"
this->NumberOfPhysicalCPU = 1; // this has to be fixed for hyper-threading.
} this->NumberOfPhysicalCPU=this->NumberOfLogicalCPU;
#endif
// LogicalProcessorsPerPhysical>1 => hyperthreading. // LogicalProcessorsPerPhysical>1 => hyperthreading.
this->Features.ExtendedFeatures.LogicalProcessorsPerPhysical= this->Features.ExtendedFeatures.LogicalProcessorsPerPhysical=
this->NumberOfLogicalCPU/this->NumberOfPhysicalCPU; this->NumberOfLogicalCPU/this->NumberOfPhysicalCPU;