get_process_mem 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d66e96644c3f8d171fd8533346150dc2a653badc
-  data.tar.gz: faaa15b6c510b50ced777bc2163042ac2934b9a6
+  metadata.gz: 1ec90ef55de8687d6be515c6191755d5411ee3ab
+  data.tar.gz: 610e87016aed28ddd40ec448b7fcd42e754cb1a4
 SHA512:
-  metadata.gz: 03f334783b312689fa9f7adcb28cd692285a2ffe181ebd5753662cb6b8b326249a57391beeea26a0198eddc2c86d8692f20bd70a02d8ab67c1d45be8bd6fc78d
-  data.tar.gz: 865fba383f18073a1bf9d7d9cfa543ad56e57544347aa3e8374899aea1f4144a8ddc7b66dc22f2762e94a55ce04970a5d9c865395577436058791bedaa87673a
+  metadata.gz: be1f8d9ddc800b00e67054d2d218e2cc6bbdc9a5972c5491941f481ff8e693d9d423315dad04ef1de9e5ab61a372e02fb5a409fbbcae10a3b4f2b23791849e58
+  data.tar.gz: c8b6e1fb05a95d651e60f86255e0b9c72089374922e1a434ed047489a800217f7d512f00188542b1b0f59e1c9b190ad97afb05cc8d53429a18a72b120e1481ed

data/.travis.yml

@@ -1,4 +1,8 @@
 language: ruby
+
+before_install:
+  - gem install bundler -v 1.12.5
+
 rvm:
   - 1.9.3
   - 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.1
+
+- Windows support.
+
 ## 0.2.0
 
 - Reverting back to RSS for linux until (#7) is resolved

data/Gemfile

@@ -1,3 +1,4 @@
 source "https://rubygems.org"
+gem 'sys-proctable'
 
 gemspec

data/README.md

@@ -12,15 +12,17 @@ In your `Gemfile` add
 gem 'get_process_mem'
 ```
 
-then run `$ bundle install`
+then run `$ bundle install`.
 
+If you're using Windows you'll also need to have the `sys-proctable` gem.
 
 ## Use It
 
 Get the current process memory usage:
 
 ```ruby
-puts mem = GetProcessMem.new.inspect
+mem = GetProcessMem.new
+puts mem.inspect
 #<GetProcessMem @mb=24.28125 @gb=0.023712158203125 @kb=24864.0 @bytes=25460736 >
 mem.bytes # => 25460736
 mem.kb    # => 24864.0
@@ -47,14 +49,7 @@ mem.inspect
 `rm tmplog`
 ```
 
-On Linux, which provides `/proc/<pid>/smaps`, the default memory type returned is PSS, or "proportional set size", where shared memory is divided by the number of processes sharing it. On other platforms, the size returned is the RSS or the [Resident Set Size](http://en.wikipedia.org/wiki/Resident_set_size), basically how much memory the program takes up in RAM at the time, including all the shared memory.
-
-The memory type can be specified by passing an options hash:
-
-```ruby
-GetProcessMem.new(Process.pid, mem_type: 'rss')
-```
-
+On Linux, for memory size we return the RSS or the [Resident Set Size](http://en.wikipedia.org/wiki/Resident_set_size), basically how much memory the program takes up in RAM at the time, including all the shared memory.
 
 
 ## License

data/appveyor.yml

@@ -0,0 +1,20 @@
+install:
+  - set PATH=C:\Ruby22\bin;%PATH%
+  - bundle install
+
+build: off
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - bundle exec rake
+
+environment:
+  matrix:
+    - RUBY_VERSION: 23
+    - RUBY_VERSION: 22
+    - RUBY_VERSION: 21
+    - RUBY_VERSION: 200

data/get_process_mem.gemspec

@@ -18,5 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_development_dependency "sys-proctable", "~> 1.0"
   gem.add_development_dependency "rake",  "~> 10.1"
+  gem.add_development_dependency "test-unit", "~> 3.1.0"
 end

data/lib/get_process_mem.rb

@@ -1,7 +1,6 @@
 require 'pathname'
 require 'bigdecimal'
 
-
 # Cribbed from Unicorn Worker Killer, thanks!
 class GetProcessMem
   KB_TO_BYTE = 1024          # 2**10   = 1024
@@ -11,10 +10,24 @@ class GetProcessMem
   ROUND_UP   = BigDecimal.new("0.5")
   attr_reader :pid
 
+  RUNS_ON_WINDOWS = Gem.win_platform?
+
+  if RUNS_ON_WINDOWS
+    begin
+      require 'sys/proctable'
+    rescue LoadError => e
+      message = "Please add `sys-proctable` to your Gemfile for windows machines\n"
+      message << e.message
+      raise e, message
+    end
+    include Sys
+  end
+
   def initialize(pid = Process.pid)
+    @status_file  = Pathname.new "/proc/#{pid}/status"
     @process_file = Pathname.new "/proc/#{pid}/smaps"
     @pid          = pid
-    @linux        = @process_file.exist?
+    @linux        = @status_file.exist?
   end
 
   def linux?
@@ -22,7 +35,7 @@ class GetProcessMem
   end
 
   def bytes
-    memory =   linux_memory if linux?
+    memory =   linux_status_memory if linux?
     memory ||= ps_memory
   end
 
@@ -43,18 +56,20 @@ class GetProcessMem
     "#<#{self.class}:0x%08x @mb=#{ mb b } @gb=#{ gb b } @kb=#{ kb b } @bytes=#{b}>" % (object_id * 2)
   end
 
-  def mem_type
-    @mem_type
-  end
-
-  def mem_type=(mem_type)
-    @mem_type = mem_type.downcase
+  # linux stores memory info in a file "/proc/#{pid}/status"
+  # If it's available it uses less resources than shelling out to ps
+  def linux_status_memory(file = @status_file)
+    line = file.each_line.detect {|line| line.start_with? 'VmRSS'.freeze }
+    return unless line
+    return unless (_name, value, unit = line.split(nil)).length == 3
+    CONVERSION[unit.downcase!] * value.to_i
+  rescue Errno::EACCES, Errno::ENOENT
+    0
   end
 
-  # linux stores memory info in a file "/proc/#{pid}/smaps"
-  # If it's available it uses less resources than shelling out to ps
+  # linux stores detailed memory info in a file "/proc/#{pid}/smaps"
   def linux_memory(file = @process_file)
-    lines = file.each_line.select {|line| line.match /^Rss/ }
+    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|
@@ -68,11 +83,14 @@ class GetProcessMem
     0
   end
 
-  private
-
   # Pull memory from `ps` command, takes more resources and can freeze
   # in low memory situations
   def ps_memory
-    KB_TO_BYTE * BigDecimal.new(`ps -o rss= -p #{pid}`)
+    if RUNS_ON_WINDOWS
+      size = ProcTable.ps(pid).working_set_size
+      BigDecimal.new(size)
+    else
+      KB_TO_BYTE * BigDecimal.new(`ps -o rss= -p #{pid}`)
+    end
   end
 end

data/lib/get_process_mem/version.rb

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

data/test/fixtures/heroku-bash-status

@@ -0,0 +1,41 @@
+Name:	bash
+State:	S (sleeping)
+Tgid:	3
+Ngid:	0
+Pid:	3
+PPid:	1
+TracerPid:	0
+Uid:	58790	58790	58790	58790
+Gid:	58790	58790	58790	58790
+FDSize:	256
+Groups:	
+VmPeak:	  109120 kB
+VmSize:	  109120 kB
+VmLck:	       0 kB
+VmPin:	       0 kB
+VmHWM:	    2032 kB
+VmRSS:	    2032 kB
+VmData:	     356 kB
+VmStk:	     136 kB
+VmExe:	     956 kB
+VmLib:	    2288 kB
+VmPTE:	      64 kB
+VmSwap:	       0 kB
+Threads:	1
+SigQ:	0/274188
+SigPnd:	0000000000000000
+ShdPnd:	0000000000000000
+SigBlk:	0000000000010000
+SigIgn:	0000000000380004
+SigCgt:	000000004b817efb
+CapInh:	0000000000000000
+CapPrm:	0000000000000000
+CapEff:	0000000000000000
+CapBnd:	0000001ff598cffe
+Seccomp:	2
+Cpus_allowed:	f
+Cpus_allowed_list:	0-3
+Mems_allowed:	00000000,00000001
+Mems_allowed_list:	0
+voluntary_ctxt_switches:	34
+nonvoluntary_ctxt_switches:	35

data/test/get_process_mem_test.rb

@@ -19,6 +19,11 @@ class GetProcessMemTest < Test::Unit::TestCase
     assert_in_delta BigDecimal.new("2122240.0"), bytes, delta
   end
 
+  def test_linux_status
+    bytes = @mem.linux_status_memory(fixture_path("heroku-bash-status"))
+    assert_equal bytes, 2080768
+  end
+
   def test_conversions
     bytes = 0
     delta = BigDecimal.new("0.0000001")

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: get_process_mem
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sys-proctable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 description: " Get memory usage of a process in Ruby "
 email:
 - richard.schneeman+rubygems@gmail.com
@@ -37,10 +65,12 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- appveyor.yml
 - get_process_mem.gemspec
 - lib/get_process_mem.rb
 - lib/get_process_mem/version.rb
 - test/fixtures/heroku-bash-smap
+- test/fixtures/heroku-bash-status
 - test/get_process_mem_test.rb
 - test/test_helper.rb
 homepage: https://github.com/schneems/get_process_mem
@@ -63,12 +93,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Use GetProcessMem to find out the amount of RAM used by any process
 test_files:
 - test/fixtures/heroku-bash-smap
+- test/fixtures/heroku-bash-status
 - test/get_process_mem_test.rb
 - test/test_helper.rb
-has_rdoc: