From c2ff8330f4d705ded3f251e170df4bd973af3d43 Mon Sep 17 00:00:00 2001 From: Adrien Thebo Date: Tue, 15 Mar 2011 17:29:19 -0700 Subject: (#5135) Refactored physicalprocessorcount - Refactored code to make testing simpler --- lib/facter/physicalprocessorcount.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/facter/physicalprocessorcount.rb b/lib/facter/physicalprocessorcount.rb index 144183c..cd5777c 100644 --- a/lib/facter/physicalprocessorcount.rb +++ b/lib/facter/physicalprocessorcount.rb @@ -39,9 +39,11 @@ Facter.add('physicalprocessorcount') do lookup_pattern = "#{sysfs_cpu_directory}" + "/cpu*/topology/physical_package_id" - Facter::Util::Resolution.exec( - "cat #{lookup_pattern}" - ).scan(/\d+/).uniq.size + 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 + else # # Try to count number of CPUs using the proc file system next ... @@ -49,9 +51,9 @@ Facter.add('physicalprocessorcount') do # We assume that /proc/cpuinfo has what we need and is so then we need # to make sure that we only count unique entries ... # - Facter::Util::Resolution.exec( - "grep 'physical.\\+:' /proc/cpuinfo" - ).scan(/\d+/).uniq.size + str = Facter::Util::Resolution.exec("grep 'physical.\\+:' /proc/cpuinfo") + + if not str.nil? then str.scan(/\d+/).uniq.size; end end end end -- cgit