rmemlimit 0.2 → 0.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTIxNDQ2YTNjYjg5ODFiZjdmOTcyYmZmMmMwODg0ZjhiMTY1NmJlZA==
+  data.tar.gz: !binary |-
+    N2I5YmNkYThjZWE5MWE0MzdhYjQ1Yjc1NDE3NzgzZGM3ZjIxNmQ3OQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZTYwODA4M2Q3MTRjYTVmMDExZTVkN2U4ZTA0MzlmM2UxOTVlMDgxZTE1Yzdi
+    ZTVlZWE2NDRlOTNmZGQxMzg1YTNjOTlkZDk3MDYxN2UzZTZiNzEzNTk0ZTE0
+    ZjRkOTIxNTJkNzRjODJiOTMyMjk0NjllYTE1ZjZmM2YxOGIzNmI=
+  data.tar.gz: !binary |-
+    YWQzMTRkNzU4N2IxZjg5YjBiYTkzNmI4MTAyM2QyNTI2NDczNTM0MTE2NDk0
+    NDc0NGY0ZDA2ZWM0MGNkZGEwMTJmZWFlMzA5NGUzYjY4ZTUwYWRjZDkwYmU5
+    NDMzNDM2Mzg2YmNlMjhiNmI4OTAxN2E3MGNhOGI2ZjJmMzY1OTQ=

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.3. Only stop GC if gc_mb is set
+
 v0.2. Changes to support forking
 
 v0.1. Proof of concept

data/lib/rmemlimit.rb

@@ -1,53 +1,55 @@
-
 class Rmemlimit
 
   class << self
-    attr_accessor :gc_mb, :kill_mb
-    
+    attr_accessor :gc_mb, :kill_mb, :sleep_time
+
     def gcthread
       if !@gcthread || !@gcthread.alive?
         @gcthread = Thread.new do
-          loop do
-            mb = rss_mb
-            if kill_mb && mb > kill_mb
-              STDERR.puts "#{self}: Exceeded kill memory limit (#{mb} > #{kill_Mb} MB)"
-              Process.kill(9, $$)
-            elsif gc_mb && mb > gc_mb
-              run_gc
-            elsif mb == 0 || !gc_mb || !kill_mb
-              run_gc
+          begin
+            loop do
+              mb = rss_mb
+              if kill_mb && mb > kill_mb
+                STDERR.puts "#{self}: Exceeded kill memory limit (#{mb} > #{kill_mb} MB)"
+                Process.kill(9, $$)
+              elsif gc_mb && mb > gc_mb
+                run_gc
+              end
+              sleep sleep_time
             end
-            sleep 1
+          rescue
+            puts "Exception: #{$!.class} #{$!}"
           end
         end
       end
     end
-    
+
     def run_gc
       GC.enable
       GC.start
       GC.disable
     end
-  
+
     def pagesize
       4096
     end
-    
+
     def rss_mb
       rss_kb >> 10
     end
-    
+
     def rss_kb
       pagesize * (File.read("/proc/#{$$}/statm").split(' ')[1].to_i rescue 0) >> 10
     end
-    
+
     def setup
+      self.sleep_time ||= 1
       self.gc_mb = ENV['RUBY_GC_MB'].to_i if ENV['RUBY_GC_MB']
       if ENV['RUBY_KILL_MB']
-        self.kill_mb = ENV['RUBY_KILL_MB'].to_i 
+        self.kill_mb = ENV['RUBY_KILL_MB'].to_i
         self.kill_mb = nil unless Rmemlimit.kill_mb > 1
       end
-      GC.disable
+      GC.disable if gc_mb
       self.gcthread
     end
   end

data/rmemlimit.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rmemlimit"
-  s.version = "0.2"
+  s.version = "0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Snow"]
-  s.date = "2013-01-11"
+  s.date = "2013-08-15"
   s.description = "Slow down garbage collector & limit ruby process memory"
   s.email = "andrew@modulus.org"
   s.extra_rdoc_files = ["CHANGELOG", "README.md", "lib/rmemlimit.rb"]
@@ -15,16 +15,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rmemlimit", "--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "rmemlimit"
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.0.3"
   s.summary = "Slow down garbage collector & limit ruby process memory"
   s.test_files = ["test/test_all.rb"]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
 end

data/test/test_all.rb

@@ -5,6 +5,7 @@ require 'test/unit'
 class TestRmemlimit < Test::Unit::TestCase
 
   def test_rss_kb
+    Rmemlimit.run_gc
     kb = Rmemlimit.rss_kb
     assert(kb > 0)
     
@@ -12,18 +13,13 @@ class TestRmemlimit < Test::Unit::TestCase
                  File.read("/proc/#{$$}/status").lines.grep(/VmRSS/).first
   end
   
-  def test_run_gc
-    gccount = GC.stat[:count] + 1
-    sleep 1.1
-    assert_equal gccount, GC.stat[:count]
-  end
-  
   def test_gc_mb
     Rmemlimit.gc_mb = Rmemlimit.rss_mb
-    gccount = GC.stat[:count] + 1
-    flibble = 'x' * 1024 * 1024
-    sleep 1.1
-    assert_equal gccount, GC.stat[:count]
+    Rmemlimit.sleep_time = 0.5
+    gccount = GC.stat[:count]
+    flibble = 'x' * 100000000
+    sleep 0.6
+    assert_equal gccount + 1, GC.stat[:count] 
   end
 
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmemlimit
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Andrew Snow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies: []
 description: Slow down garbage collector & limit ruby process memory
 email: andrew@modulus.org
@@ -29,6 +28,7 @@ files:
 - rmemlimit.gemspec
 homepage: https://github.com/andys/rmemlimit
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -44,18 +44,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.2'
-  none: false
 requirements: []
 rubyforge_project: rmemlimit
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Slow down garbage collector & limit ruby process memory
 test_files:
 - test/test_all.rb