rmemlimit 0.1 → 0.2

data/CHANGELOG

@@ -1 +1,3 @@
+v0.2. Changes to support forking
+
 v0.1. Proof of concept

data/Manifest

@@ -1,6 +1,6 @@
 CHANGELOG
+Manifest
 README.md
 Rakefile
 lib/rmemlimit.rb
 test/test_all.rb
-Manifest

data/README.md

@@ -14,6 +14,8 @@ instead, in a background thread.
 
     gem 'rmemlimit' # in your Gemfile
 
+    Rmemlimit.setup # somewhere in app startup, or after forking
+
 
 #### Set a memory limit for GC (requires linux /proc)
 
@@ -35,3 +37,10 @@ kill itself when it passes a threshold, you can do limit to say 1000MB:
 
 (Or you can use the RUBY_KILL_MB environment variable)
 
+
+#### Forking
+
+When fork()ing in ruby 1.9, only the thread doing the fork keeps running in
+the child.  So you have to call Rmemlimit.setup in every child after
+forking, or GC won't be running at all.
+

data/lib/rmemlimit.rb

@@ -5,18 +5,20 @@ class Rmemlimit
     attr_accessor :gc_mb, :kill_mb
     
     def gcthread
-      @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
+      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
+            end
+            sleep 1
           end
-          sleep 1
         end
       end
     end
@@ -51,5 +53,3 @@ class Rmemlimit
   end
 
 end
-
-Rmemlimit.setup

data/rmemlimit.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "rmemlimit"
-  s.version = "0.1"
+  s.version = "0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Snow"]
-  s.date = "2012-12-28"
+  s.date = "2013-01-11"
   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"]
-  s.files = ["CHANGELOG", "README.md", "Rakefile", "lib/rmemlimit.rb", "test/test_all.rb", "Manifest", "rmemlimit.gemspec"]
+  s.files = ["CHANGELOG", "Manifest", "README.md", "Rakefile", "lib/rmemlimit.rb", "test/test_all.rb", "rmemlimit.gemspec"]
   s.homepage = "https://github.com/andys/rmemlimit"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rmemlimit", "--main", "README.md"]
   s.require_paths = ["lib"]

data/test/test_all.rb

@@ -1,4 +1,5 @@
 require "#{File.dirname(__FILE__)}/../lib/rmemlimit"
+Rmemlimit.setup
 require 'test/unit'
 
 class TestRmemlimit < Test::Unit::TestCase

metadata

@@ -2,14 +2,14 @@
 name: rmemlimit
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Andrew Snow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies: []
 description: Slow down garbage collector & limit ruby process memory
 email: andrew@modulus.org
@@ -21,11 +21,11 @@ extra_rdoc_files:
 - lib/rmemlimit.rb
 files:
 - CHANGELOG
+- Manifest
 - README.md
 - Rakefile
 - lib/rmemlimit.rb
 - test/test_all.rb
-- Manifest
 - rmemlimit.gemspec
 homepage: https://github.com/andys/rmemlimit
 licenses: []