duffy 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb8eb853b9f7031529ff8e262da8326f4fc71717
-  data.tar.gz: 3870efe3410dda8f56315c70131fd74bee2a9b13
+  metadata.gz: 21c3ea1e97e41dfc1f1e3f82e5c35b53d560f96c
+  data.tar.gz: 200eab70b8d0017ff974f42b7d95ea1d530d5c9d
 SHA512:
-  metadata.gz: e70c4895da1389f502e4720fdb10cf015df66b83c525fa23786126ae1aec20061cfa31af56677dd1ed2069371ca16fd0e8d4ab0a5a031f1030e59e05b3c0a426
-  data.tar.gz: bc6794238f7fd77396bbd5ae5146ba84a13f152a6d89a506f951ded7c72d0bc35e2f63e5e59edc3d13ddb98aa8bd0c37987637a4e99020ad182ed70f3d5fa834
+  metadata.gz: 3559f84b6cb9d4d6bdd222985823ced43d62b25b11087d05dd1657a02cba276ea6f71ba2879d41ab56973bb1f04e3d86f0afc29166286aa6cf6b6d01ee62bbf7
+  data.tar.gz: 07aa37fc3a695b5f8179312084ee1b1c4b829f638161226bb7fc322464ecb2a3b20d4515d385a48c9d1b0f8b8ef87e793e71bb0807fe0aaf65dfa45c44b6b6d7

data/README.md

@@ -75,7 +75,8 @@ Duffy::Git.branch   | Current git branch.
 
 
 ## CPU Detection:
-* Linux and Mac only for now, each method returns 1 on unsupported hosts.
+* Linux and Mac only for now, numeric methods return 1 on unsupported hosts.
+* `virtual?` detects if the system is hypervisor guest. Will return false if unable to determine.
 * Example results for my dual core i5 with hyperthreading.
 
 Method    |   Result
@@ -85,6 +86,7 @@ Duffy::System.cores      | 2
 Duffy::System.threads    | 4
 Duffy::System.sane_load  | 3
 Duffy::System.cpu_percent| 16
+Duffy::System.virtual?   | true
 
 ## Memory Statistics:
 * All values returned in Megabytes.

data/lib/duffy/system.rb

@@ -21,7 +21,7 @@ module Duffy
       # Mac:    hw.physicalcpu
       def cores
         case RUBY_PLATFORM
-          when /linux/  then File.read('/proc/cpuinfo').scan(/(cpu cores).*(\d+)/)[0][1].to_i * cpus
+          when /linux/  then File.read('/proc/cpuinfo').scan(/(cpu cores)(\D)*(\d+)/)[0][2].to_i * cpus
           when /darwin/ then `sysctl -n hw.physicalcpu`.to_i
           else 1
         end
@@ -40,10 +40,20 @@ module Duffy
         1
       end
 
+      def virtual?
+        case RUBY_PLATFORM
+          when /linux/  then !!File.read('/proc/cpuinfo').scan(/^flags.*(hypervisor)/)[0]
+          when /darwin/ then false # PENDING
+          else false
+        end
+      rescue
+        false
+      end
+
       # What is a sane number of threads to use for data processing.
-      # Only using physical cores is a waste, using all logical cores decreases performance.
+      # You want to leave some headroom for your database etc running in other processes.
       def sane_load
-        (cores + threads) / 2
+        threads * 3 / 4
       end
 
       # The system's current CPU utilization.

data/lib/duffy/version.rb

@@ -1,8 +1,9 @@
 module Duffy
-  VERSION = "0.3.4"
+  VERSION = '0.3.5'
 end
 
 # History
+# 0.3.5 - Fixed linux cores detection for very high core count CPUs.  Added virtualization detection on linux.
 # 0.3.4 - pretty_phone now adds the dash for 7 digit phone numbers.
 # 0.3.3 - Added beginning_of_fiscal_year and end_of_fiscal_year methods to Date
 # 0.3.2 - Added mem_percentage as a convenience and safeguard against div/0 in user code.

data/spec/system_spec.rb

@@ -22,7 +22,12 @@ describe Duffy::System do
     it "returns the total number of threads" do
       expect(Duffy::System.threads).to be_an(Integer)
       expect(Duffy::System.threads).to be >= 1
+    end
+  end
 
+  describe "virtual?" do
+    it "returns true if in a hypervisor, false otherwise." do
+      expect(Duffy::System.virtual?).to be_in [true, false]
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duffy
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Jacob Duffy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport