Merge 7a1039d into 91df292

.rubocop.yml

@@ -22,6 +22,7 @@ Metrics/MethodLength:
     - 'lib/custom_facts/core/execution/windows.rb'
     - 'lib/custom_facts/core/execution/base.rb'
     - 'lib/framework/detector/os_detector.rb'
+    - 'lib/resolvers/bsd/ffi/ffi_helper.rb'
 
 Metrics/ModuleLength:
   Max: 100
@@ -53,6 +54,7 @@ Metrics/AbcSize:
     - 'lib/custom_facts/core/execution/windows.rb'
     - 'lib/custom_facts/core/execution/base.rb'
     - 'lib/custom_facts/core/resolvable.rb'
+    - 'lib/resolvers/bsd/ffi/ffi_helper.rb'
 
 Style/FrozenStringLiteralComment:
   Exclude:

.rubocop_todo.yml

@@ -6,7 +6,7 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 81
+# Offense count: 82
 # Configuration parameters: CustomTransform, IgnoreMethods.
 RSpec/FilePath:
   Exclude:
@@ -41,6 +41,7 @@ RSpec/FilePath:
     - 'spec/facter/resolvers/dmi_resolver_spec.rb'
     - 'spec/facter/resolvers/filesystems_resolver_spec.rb'
     - 'spec/facter/resolvers/fips_enabled_resolver_spec.rb'
+    - 'spec/facter/resolvers/freebsd/ffi_helper_spec.rb'
     - 'spec/facter/resolvers/identity_resolver_spec.rb'
     - 'spec/facter/resolvers/load_averages_resolver_spec.rb'
     - 'spec/facter/resolvers/macosx/dmi_resolver_spec.rb'
@@ -187,7 +188,7 @@ RSpec/SubjectStub:
     - 'spec/custom_facts/util/fact_spec.rb'
     - 'spec/custom_facts/util/resolution_spec.rb'
 
-# Offense count: 132
+# Offense count: 138
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
@@ -223,6 +224,7 @@ RSpec/VerifiedDoubles:
     - 'spec/facter/resolvers/aix/ffi_helper_spec.rb'
     - 'spec/facter/resolvers/aix/hardware_resolver_spec.rb'
     - 'spec/facter/resolvers/bsd/ffi_helper_spec.rb'
+    - 'spec/facter/resolvers/freebsd/ffi_helper_spec.rb'
     - 'spec/facter/resolvers/macosx/mountpoints_resolver_spec.rb'
     - 'spec/facter/resolvers/mountpoints_resolver_spec.rb'
     - 'spec/facter/resolvers/utils/windows/network_utils_spec.rb'

lib/facts/bsd/processors/count.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Bsd
+    module Processors
+      class Count
+        FACT_NAME = 'processors.count'
+        ALIASES = 'processorcount'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Bsd::Processors.resolve(:logical_count)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

lib/facts/bsd/processors/models.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Facts
+  module Bsd
+    module Processors
+      class Models
+        FACT_NAME = 'processors.models'
+        ALIASES = 'processor.*'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Bsd::Processors.resolve(:models)
+          return nil unless fact_value
+
+          facts = [Facter::ResolvedFact.new(FACT_NAME, fact_value)]
+          fact_value.each_with_index do |value, index|
+            facts.push(Facter::ResolvedFact.new("processor#{index}", value, :legacy))
+          end
+          facts
+        end
+      end
+    end
+  end
+end

lib/facts/bsd/processors/speed.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Bsd
+    module Processors
+      class Speed
+        FACT_NAME = 'processors.speed'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Bsd::Processors.resolve(:speed)
+          speed = Facter::FactsUtils::UnitConverter.hertz_to_human_readable(fact_value)
+          Facter::ResolvedFact.new(FACT_NAME, speed)
+        end
+      end
+    end
+  end
+end

lib/facts/freebsd/processors/speed.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Processors
+      class Speed
+        FACT_NAME = 'processors.speed'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Freebsd::Processors.resolve(:speed)
+          speed = Facter::FactsUtils::UnitConverter.hertz_to_human_readable(fact_value)
+          Facter::ResolvedFact.new(FACT_NAME, speed)
+        end
+      end
+    end
+  end
+end

lib/resolvers/bsd/ffi/ffi_helper.rb

@@ -10,6 +10,7 @@ module Libc
 
         ffi_lib 'c'
         attach_function :getloadavg, %i[pointer int], :int
+        attach_function :sysctl, %i[pointer uint pointer pointer pointer size_t], :int
       end
 
       def self.read_load_averages
@@ -20,6 +21,36 @@ def self.read_load_averages
 
         raw_loadavg.read_array_of_double(res)
       end
+
+      def self.sysctl(type, oids)
+        name = FFI::MemoryPointer.new(:uint, oids.size)
+        name.write_array_of_uint(oids)
+        namelen = oids.size
+
+        oldp = FFI::Pointer::NULL
+        oldlenp = FFI::MemoryPointer.new(:size_t)
+
+        newp = FFI::Pointer::NULL
+        newlen = 0
+
+        if type == :string
+          res = Libc.sysctl(name, namelen, oldp, oldlenp, newp, newlen)
+          return nil if res.negative?
+        else
+          oldlenp.write(:size_t, FFI.type_size(type))
+        end
+
+        oldp = FFI::MemoryPointer.new(:uint8_t, oldlenp.read(:size_t))
+        res = Libc.sysctl(name, namelen, oldp, oldlenp, newp, newlen)
+        return nil if res.negative?
+
+        case type
+        when :string
+          oldp.read_string
+        else
+          oldp.read(type)
+        end
+      end
     end
   end
 end

lib/resolvers/bsd/processors.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Bsd
+      class Processors < BaseResolver
+        @log = Facter::Log.new(self)
+        @semaphore = Mutex.new
+        @fact_list ||= {}
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { collect_processors_info(fact_name) }
+          end
+
+          def collect_processors_info(fact_name)
+            require "#{ROOT_DIR}/lib/resolvers/bsd/ffi/ffi_helper"
+
+            @fact_list[:logical_count] = logical_count
+            @fact_list[:models] = Array.new(logical_count, model) if logical_count && model
+            @fact_list[:speed] = speed * 1000 * 1000 if speed
+
+            @fact_list[fact_name]
+          end
+
+          CTL_HW = 6
+          HW_MODEL = 2
+          HW_NCPU = 3
+          HW_CPUSPEED = 12
+
+          def model
+            @model ||= Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_MODEL])
+          end
+
+          def logical_count
+            @logical_count ||= Facter::Bsd::FfiHelper.sysctl(:uint32_t, [CTL_HW, HW_NCPU])
+          end
+
+          def speed
+            @speed ||= Facter::Bsd::FfiHelper.sysctl(:uint32_t, [CTL_HW, HW_CPUSPEED])
+          end
+        end
+      end
+    end
+  end
+end

lib/resolvers/freebsd/ffi/ffi_helper.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'ffi'
+
+module Facter
+  module Freebsd
+    module FfiHelper
+      module Libc
+        extend FFI::Library
+
+        ffi_lib 'c'
+        attach_function :sysctlbyname, %i[string pointer pointer pointer size_t], :int
+      end
+
+      def self.sysctl_by_name(type, name)
+        oldp = FFI::Pointer::NULL
+        oldlenp = FFI::MemoryPointer.new(:size_t)
+
+        newp = FFI::Pointer::NULL
+        newlenp = 0
+
+        if type == :string
+          res = Libc.sysctlbyname(name, oldp, oldlenp, newp, newlenp)
+          return nil if res.negative?
+        else
+          oldlenp.write(:size_t, FFI.type_size(type))
+        end
+
+        oldp = FFI::MemoryPointer.new(:uint8_t, oldlenp.read(:size_t))
+        res = Libc.sysctlbyname(name, oldp, oldlenp, newp, newlenp)
+        return nil if res.negative?
+
+        case type
+        when :string
+          oldp.read_string
+        else
+          oldp.read(type)
+        end
+      end
+    end
+  end
+end

lib/resolvers/freebsd/processors.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'resolvers/bsd/processors'
+
+module Facter
+  module Resolvers
+    module Freebsd
+      class Processors < Facter::Resolvers::Bsd::Processors
+        @log = Facter::Log.new(self)
+        @semaphore = Mutex.new
+        @fact_list ||= {}
+        class << self
+          private
+
+          def collect_processors_info(fact_name)
+            require "#{ROOT_DIR}/lib/resolvers/freebsd/ffi/ffi_helper"
+            super(fact_name)
+          end
+
+          def speed
+            @speed ||= Facter::Freebsd::FfiHelper.sysctl_by_name(:uint32_t, 'hw.clockrate')
+          end
+        end
+      end
+    end
+  end
+end

spec/facter/facts/bsd/processors/count_spec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+describe Facts::Bsd::Processors::Count do
+  describe '#call_the_resolver' do
+    subject(:fact) { Facts::Bsd::Processors::Count.new }
+
+    let(:processors) { '4' }
+
+    before do
+      allow(Facter::Resolvers::Bsd::Processors).to \
+        receive(:resolve).with(:logical_count).and_return(processors)
+    end
+
+    it 'calls Facter::Resolvers::Macosx::Processors' do
+      fact.call_the_resolver
+      expect(Facter::Resolvers::Bsd::Processors).to have_received(:resolve).with(:logical_count)
+    end
+
+    it 'returns a resolved fact' do
+      expect(fact.call_the_resolver).to be_an_instance_of(Array).and \
+        contain_exactly(an_object_having_attributes(name: 'processors.count', value: processors),
+                        an_object_having_attributes(name: 'processorcount', value: processors, type: :legacy))
+    end
+  end
+end

spec/facter/facts/bsd/processors/models_spec.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+describe Facts::Bsd::Processors::Models do
+  describe '#call_the_resolver' do
+    subject(:fact) { Facts::Bsd::Processors::Models.new }
+
+    let(:value) { 'Intel(R) Core(TM) i7-4980HQ CPU @ 2.80GHz' }
+    let(:models) { [value, value] }
+
+    before do
+      allow(Facter::Resolvers::Bsd::Processors).to \
+        receive(:resolve).with(:models).and_return(models)
+    end
+
+    it 'calls Facter::Resolvers::Bsd::Processors' do
+      fact.call_the_resolver
+      expect(Facter::Resolvers::Bsd::Processors).to have_received(:resolve).with(:models)
+    end
+
+    it 'returns a resolved fact' do
+      expect(fact.call_the_resolver).to be_an_instance_of(Array).and \
+        contain_exactly(an_object_having_attributes(name: 'processors.models', value: models),
+                        an_object_having_attributes(name: 'processor0', value: value, type: :legacy),
+                        an_object_having_attributes(name: 'processor1', value: value, type: :legacy))
+    end
+  end
+end

spec/facter/facts/bsd/processors/speed_spec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+describe Facts::Bsd::Processors::Speed do
+  describe '#call_the_resolver' do
+    subject(:fact) { Facts::Bsd::Processors::Speed.new }
+
+    let(:speed) { 1_800_000_000 }
+    let(:converted_speed) { '1.80 GHz' }
+
+    before do
+      allow(Facter::Resolvers::Bsd::Processors).to \
+        receive(:resolve).with(:speed).and_return(speed)
+    end
+
+    it 'calls Facter::Resolvers::Macosx::Processors' do
+      fact.call_the_resolver
+      expect(Facter::Resolvers::Bsd::Processors).to have_received(:resolve).with(:speed)
+    end
+
+    it 'returns a resolved fact' do
+      expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \
+        have_attributes(name: 'processors.speed', value: converted_speed)
+    end
+  end
+end

spec/facter/facts/solaris/processors/models_spec.rb

@@ -12,7 +12,7 @@
         receive(:resolve).with(:models).and_return(models)
     end
 
-    it 'calls Facter::Resolvers::Macosx::Processors' do
+    it 'calls Facter::Resolvers::Solaris::Processors' do
       fact.call_the_resolver
       expect(Facter::Resolvers::Solaris::Processors).to have_received(:resolve).with(:models)
     end