From 3a4e6964ba4af375df2cee953d5a800930e487ec Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Fri, 4 Dec 2015 22:13:58 -0800 Subject: [PATCH] Correctly count real vs. total vs. cores on darwin --- lib/ohai/plugins/darwin/cpu.rb | 10 ++++++---- spec/unit/plugins/darwin/cpu_spec.rb | 11 ++++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/ohai/plugins/darwin/cpu.rb b/lib/ohai/plugins/darwin/cpu.rb index ec8f095b1..8e2032fac 100644 --- a/lib/ohai/plugins/darwin/cpu.rb +++ b/lib/ohai/plugins/darwin/cpu.rb @@ -1,7 +1,7 @@ # # Author:: Nathan L Smith () -# Author:: Tim Smith () -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Author:: Tim Smith () +# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,10 +22,12 @@ collect_data(:darwin) do cpu Mash.new - so = shell_out("sysctl -n hw.physicalcpu") + so = shell_out("sysctl -n hw.packages") cpu[:real] = so.stdout.to_i - so = shell_out("sysctl -n hw.logicalcpu") + so = shell_out("sysctl -n hw.physicalcpu") cpu[:total] = so.stdout.to_i + so = shell_out("sysctl -n hw.logicalcpu") + cpu[:cores] = so.stdout.to_i so = shell_out("sysctl -n hw.cpufrequency") cpu[:mhz] = so.stdout.to_i / 1000000 so = shell_out("sysctl -n machdep.cpu.vendor") diff --git a/spec/unit/plugins/darwin/cpu_spec.rb b/spec/unit/plugins/darwin/cpu_spec.rb index 5ddc6e3a7..bffe6af75 100644 --- a/spec/unit/plugins/darwin/cpu_spec.rb +++ b/spec/unit/plugins/darwin/cpu_spec.rb @@ -1,6 +1,6 @@ # # Author:: Nathan L Smith () -# Copyright:: Copyright (c) 2013 Opscode, Inc. +# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,6 +23,7 @@ before(:each) do @plugin = get_plugin("darwin/cpu") allow(@plugin).to receive(:collect_os).and_return(:darwin) + allow(@plugin).to receive(:shell_out).with("sysctl -n hw.packages").and_return(mock_shell_out(0, "1", "")) allow(@plugin).to receive(:shell_out).with("sysctl -n hw.physicalcpu").and_return(mock_shell_out(0, "4", "")) allow(@plugin).to receive(:shell_out).with("sysctl -n hw.logicalcpu").and_return(mock_shell_out(0, "8", "")) allow(@plugin).to receive(:shell_out).with("sysctl -n hw.cpufrequency").and_return(mock_shell_out(0, "2300000000", "")) @@ -35,14 +36,18 @@ @plugin.run end - it "should set cpu[:total] to 8" do + it "should set cpu[:cores] to 8" do expect(@plugin[:cpu][:total]).to eq(8) end - it "should set cpu[:real] to 4" do + it "should set cpu[:total] to 4" do expect(@plugin[:cpu][:real]).to eq(4) end + it "should set cpu[:real] to 1" do + expect(@plugin[:cpu][:real]).to eq(1) + end + it "should set cpu[:mhz] to 2300" do expect(@plugin[:cpu][:mhz]).to eq(2300) end