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

ENH: avoid divide by zero, temporary fix until cygwin cpu file is read better, bad cpu info is better than a crash

This commit is contained in:
Bill Hoffman 2008-06-01 11:23:22 -04:00
parent 9f3e67eabf
commit fc5bc3380e
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/kwsys/SystemInformation.cxx
View File

@ -2158,9 +2158,7 @@ int SystemInformationImplementation::RetreiveInformationFromCpuInfoFile()
fileSize++; fileSize++;
} }
fclose( fd ); fclose( fd );
buffer.resize(fileSize-2); buffer.resize(fileSize-2);
// Number of logical CPUs (combination of multiple processors, multi-core // Number of logical CPUs (combination of multiple processors, multi-core
// and hyperthreading) // and hyperthreading)
size_t pos = buffer.find("processor\t"); size_t pos = buffer.find("processor\t");
@ -2184,16 +2182,18 @@ int SystemInformationImplementation::RetreiveInformationFromCpuInfoFile()
idc = this->ExtractValueFromCpuInfoFile(buffer,"physical id", idc = this->ExtractValueFromCpuInfoFile(buffer,"physical id",
this->CurrentPositionInFile+1); this->CurrentPositionInFile+1);
} }
// 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)
{
this->NumberOfPhysicalCPU = 1;
}
// LogicalProcessorsPerPhysical>1 => hyperthreading. // LogicalProcessorsPerPhysical>1 => hyperthreading.
this->Features.ExtendedFeatures.LogicalProcessorsPerPhysical= this->Features.ExtendedFeatures.LogicalProcessorsPerPhysical=
this->NumberOfLogicalCPU/this->NumberOfPhysicalCPU; this->NumberOfLogicalCPU/this->NumberOfPhysicalCPU;
@ -2221,8 +2221,6 @@ int SystemInformationImplementation::RetreiveInformationFromCpuInfoFile()
cacheSize = cacheSize.substr(0,pos); cacheSize = cacheSize.substr(0,pos);
} }
this->Features.L1CacheSize = atoi(cacheSize.c_str()); this->Features.L1CacheSize = atoi(cacheSize.c_str());
return 1; return 1;
} }