[Cmake-commits] [cmake-commits] hoffman committed SystemInformation.cxx 1.32 1.33

cmake-commits at cmake.org cmake-commits at cmake.org
Sun Jun 1 23:40:33 EDT 2008


Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv19940

Modified Files:
	SystemInformation.cxx 
Log Message:
ENH: fix crash on dash17 linux where the parsing of the proc file must not have worked right


Index: SystemInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemInformation.cxx,v
retrieving revision 1.32
retrieving revision 1.33
diff -C 2 -d -r1.32 -r1.33
*** SystemInformation.cxx	1 Jun 2008 20:11:38 -0000	1.32
--- SystemInformation.cxx	2 Jun 2008 03:40:30 -0000	1.33
***************
*** 2200,2204 ****
      this->NumberOfLogicalCPU = atoi(cpucount.c_str());
  #endif
! 
    // LogicalProcessorsPerPhysical>1 => hyperthreading.
    this->Features.ExtendedFeatures.LogicalProcessorsPerPhysical=
--- 2200,2209 ----
      this->NumberOfLogicalCPU = atoi(cpucount.c_str());
  #endif
!   // gotta have one, and if this is 0 then we get a / by 0n 
!   // beter to have a bad answer than a crash
!   if(this->NumberOfPhysicalCPU <= 0)
!     {
!     this->NumberOfPhysicalCPU = 1;
!     }
    // LogicalProcessorsPerPhysical>1 => hyperthreading.
    this->Features.ExtendedFeatures.LogicalProcessorsPerPhysical=



More information about the Cmake-commits mailing list