[Pkg-puppet-devel] [SCM] Packaging of Facter for debian branch, experimental_upstream, updated. 1.5.9-54-g5a4eeed

[James Turnbull]

The following commit has been merged in the experimental_upstream branch:
commit fc930d8c26c81075eb35ae728777f190d5af1402
Merge: e42e57c1a5674d77dfa14e10ade9592f5d2052e7 c2ff8330f4d705ded3f251e170df4bd973af3d43
Author: James Turnbull <james at lovedthanlost.net>
Date:   Wed Apr 6 02:12:07 2011 +1000

    Fixed #5135 - Facter returns physicalprocessorcount => 0 on a physical computer

diff --combined lib/facter/physicalprocessorcount.rb
index 9c59614,cd5777c..c6145dc
--- a/lib/facter/physicalprocessorcount.rb
+++ b/lib/facter/physicalprocessorcount.rb
@@@ -3,16 -3,57 +3,57 @@@
  # Purpose: Return the number of physical processors.
  #
  # Resolution:
- #   On linux, parses the output of '/proc/cpuinfo' for the number of unique
- #   lines with "physical id" in them.
++#
+ #   Attempts to use sysfs to get the physical IDs of the processors. Falls
+ #   back to /proc/cpuinfo and "physical id" if sysfs is not available.
  #
  # Caveats:
  #
 -
+ Facter.add('physicalprocessorcount') do
+   confine :kernel => :linux
+ 
+   setcode do
+     sysfs_cpu_directory = '/sys/devices/system/cpu' # This should always be there ...
+ 
+     if File.exists?(sysfs_cpu_directory)
+       #
+       # We assume that the sysfs file system has the correct number of entries
+       # under the "/sys/device/system/cpu" directory and if so then we process
+       # content of the file "physical_package_id" located inside the "topology"
+       # directory in each of the per-CPU sub-directories.
+       #
+       # As per Linux Kernel documentation and the file "cputopology.txt" located
+       # inside the "/usr/src/linux/Documentation" directory we can find following
+       # short explanation:
+       #
+       # (...)
+       #
+       # 1) /sys/devices/system/cpu/cpuX/topology/physical_package_id:
+       #
+       #         physical package id of cpuX. Typically corresponds to a physical
+       #         socket number, but the actual value is architecture and platform
+       #         dependent.
+       #
+       # (...)
+       #
+       lookup_pattern = "#{sysfs_cpu_directory}" +
+         "/cpu*/topology/physical_package_id"
+ 
+       ids = Dir.glob(lookup_pattern).collect { |f| Facter::Util::Resolution.exec("cat #{f}")}
+ 
+       ids = ids.join if ids.is_a?(Array)
+       ids.scan(/\d+/).uniq.size
  
- Facter.add("physicalprocessorcount") do
-     confine :kernel => :linux
+     else
+       #
+       # Try to count number of CPUs using the proc file system next ...
+       #
+       # We assume that /proc/cpuinfo has what we need and is so then we need
+       # to make sure that we only count unique entries ...
+       #
+       str = Facter::Util::Resolution.exec("grep 'physical.\\+:' /proc/cpuinfo")
  
-     setcode do
-         ppcount = Facter::Util::Resolution.exec('grep "physical id" /proc/cpuinfo|cut -d: -f 2|sort -u|wc -l')
+       if not str.nil? then str.scan(/\d+/).uniq.size; end
      end
+   end
  end

-- 
Packaging of Facter for debian