Count cores properly in AWS/Ubuntu

Since the /proc/cpuinfo file format has no standard, and ubuntu (or the version we use) says 'processor' not 'core id'.
sempervictus · Oct 1, 2012 · a747b66 · a747b66
1 parent cd8f976
commit a747b66
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/celluloid/cpu_counter.rb b/lib/celluloid/cpu_counter.rb
@@ -6,7 +6,7 @@ module CPUCounter
     when 'darwin'
       @cores = Integer(`sysctl hw.ncpu`[/\d+/])
     when 'linux'
-      @cores = File.read("/proc/cpuinfo").scan(/core id\s+: \d+/).uniq.size
+      @cores = File.read("/proc/cpuinfo").scan(/(?:core id|processor)\s+: \d+/).uniq.size
     when 'mingw', 'mswin'
       @cores = Integer(`SET NUMBER_OF_PROCESSORS`[/\d+/])
     else