get_process_mem 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52264416d05e8d73e6a2d1245f1f9bca7b043fb2
-  data.tar.gz: 5ea9ced69283b2a9e0ea07f08f9dd7d5e928e707
+  metadata.gz: d66e96644c3f8d171fd8533346150dc2a653badc
+  data.tar.gz: faaa15b6c510b50ced777bc2163042ac2934b9a6
 SHA512:
-  metadata.gz: 7b2446a2c0f9fa8f4c387a5ca82f455b4063874f3516a5615c744a4790eb0e166dcfd03400ac52694fef8f557159f5641377194db6be73e495b01cefa4413ccf
-  data.tar.gz: 98d55d7547d8c73e5d87ed91012df5672abc44d71a5b2853d60f0a6fbdead3d6530bbc8891b026361e48856f6c5f8fd39e5c9ae25fa64a9f19536c51b2d7f5be
+  metadata.gz: 03f334783b312689fa9f7adcb28cd692285a2ffe181ebd5753662cb6b8b326249a57391beeea26a0198eddc2c86d8692f20bd70a02d8ab67c1d45be8bd6fc78d
+  data.tar.gz: 865fba383f18073a1bf9d7d9cfa543ad56e57544347aa3e8374899aea1f4144a8ddc7b66dc22f2762e94a55ce04970a5d9c865395577436058791bedaa87673a

data/CHANGELOG.md

@@ -1,4 +1,9 @@
+## 0.2.0
+
+- Reverting back to RSS for linux until (#7) is resolved
+
 ## 0.1.1
+
 - Bugfix: the `ps` style of memory reporting should always use RSS, and Linux should always use PSS
 
 ## 0.1.0

data/lib/get_process_mem.rb

@@ -53,19 +53,19 @@ class GetProcessMem
 
   # linux stores memory info in a file "/proc/#{pid}/smaps"
   # If it's available it uses less resources than shelling out to ps
-  # It also allows us to use Pss (the process' proportional share of
-  # the mapping that is resident in RAM) as mem_type
   def linux_memory(file = @process_file)
-    lines = file.each_line.select {|line| line.match /^Pss/ }
+    lines = file.each_line.select {|line| line.match /^Rss/ }
     return if lines.empty?
     lines.reduce(0) do |sum, line|
       line.match(/(?<value>(\d*\.{0,1}\d+))\s+(?<unit>\w\w)/) do |m|
         value = BigDecimal.new(m[:value]) + ROUND_UP
         unit  = m[:unit].downcase
-        sum += CONVERSION[unit] * value
+        sum  += CONVERSION[unit] * value
       end
       sum
     end
+  rescue Errno::EACCES
+    0
   end
 
   private
@@ -76,5 +76,3 @@ class GetProcessMem
     KB_TO_BYTE * BigDecimal.new(`ps -o rss= -p #{pid}`)
   end
 end
-
-GetProcessMem

data/lib/get_process_mem/version.rb

@@ -1,3 +1,3 @@
 class GetProcessMem
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/test/get_process_mem_test.rb

@@ -16,7 +16,7 @@ class GetProcessMemTest < Test::Unit::TestCase
   def test_linux_smap
     delta = 1
     bytes = @mem.linux_memory(fixture_path("heroku-bash-smap"))
-    assert_in_delta BigDecimal.new("1217024.0"), bytes, delta
+    assert_in_delta BigDecimal.new("2122240.0"), bytes, delta
   end
 
   def test_conversions
@@ -44,4 +44,4 @@ class GetProcessMemTest < Test::Unit::TestCase
     assert_in_delta  1024.0,              @mem.mb(bytes), delta
     assert_in_delta  1.0,                 @mem.gb(bytes), delta
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: get_process_mem
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -71,3 +71,4 @@ test_files:
 - test/fixtures/heroku-bash-smap
 - test/get_process_mem_test.rb
 - test/test_helper.rb
+has_rdoc: