gctools 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjljNDc0ZTJlODRiODIyNzE0MTFlYTJlYTE4ZWUxYzc2MzU4MjgzYQ==
-  data.tar.gz: !binary |-
-    MWJhNWZmZjZjY2RkNTlhYWY0M2JmZTdjYjk1ODE3OWU5NDVkNzk5Ng==
+SHA1:
+  metadata.gz: cdf4e1fc73eda1b540f37f0acb8ef1e3aa8c11a8
+  data.tar.gz: 4f7e7d7602e755fef8bbc6aee049609c839138fd
 SHA512:
-  metadata.gz: !binary |-
-    MjBkNTBkNzA2NDNlYTU2MzhiMjc5NzMyODI1NTEzZmI2ZTRjZGZhNWQwNjI5
-    YmExYWU5ODJjMjI3MjE4ZGE3MWFkNTBmZmU0NGEwMmZmMzA0NjU0NDhmMDg2
-    NDk5YzQ0MmRlZDNiMTZkMWFjZWVlNTNhM2RiMTU4YzM4MjA2NTA=
-  data.tar.gz: !binary |-
-    ODFmZGM1OWE0MWFmNTUwNWZmYjE4N2MyMDdmYzAwZTk5Nzg4NDZiZWU5OTc2
-    MGMyNDgxNmZkOGUwMjlkMTdlNmQxMWY3NzA4OWUxYjMwMTVhY2MyZjljNTgw
-    NjBjNjVkM2FhZDFjM2FmNmRiOTIxYmU5MmI0YTVmMjcxZWYyNTU=
+  metadata.gz: b2bea28697a4bbcb2ce14366017baf18f893e7bd4e187b03f3b0b94ad11a5de35e0b20f68508ad6600414bc61111d9c41d2c8f7be69637e4ce92fa749484dc7c
+  data.tar.gz: 2bb6d8c558d9952d813ef6535827463f1ab087811123aca71dbed76a39108795da7848a52522b43fed34630b052f0d0d12f746c3daa82a917b44e07ba143a56b

data/Gemfile.lock

@@ -6,6 +6,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    minitest (5.8.3)
     rake (10.1.0)
     rake-compiler (0.9.2)
       rake
@@ -15,4 +16,5 @@ PLATFORMS
 
 DEPENDENCIES
   gctools!
+  minitest (~> 5.0)
   rake-compiler (~> 0.9)

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013-2014 Aman Gupta
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -26,5 +26,4 @@ require 'gctools/logger'
 require 'gctools/oobgc'
 GC::OOB.run # after every request
 use(GC::OOB::UnicornMiddleware) # in config.ru for unicorn
-use(GC::OOB::PumaMiddleware) # in config.ru for puma
 ```

data/ext/oobgc/oobgc.c

@@ -1,6 +1,7 @@
 #include <time.h>
 #include <sys/time.h>
 #include "ruby/ruby.h"
+#include "ruby/version.h"
 #include "ruby/intern.h"
 #include "ruby/debug.h"
 
@@ -14,8 +15,8 @@ struct {
   size_t heap_obj_limit;
 
   struct {
-    size_t total_allocated_object;
-    size_t heap_tomb_page_length;
+    size_t total_allocated_objects;
+    size_t heap_tomb_pages;
   } start;
 
   struct {
@@ -31,8 +32,8 @@ struct {
 } _oobgc;
 
 static VALUE mOOB;
-static VALUE sym_total_allocated_object, sym_heap_swept_slot, sym_heap_tomb_page_length, sym_heap_final_slot;
-static VALUE sym_old_object, sym_old_object_limit, sym_remembered_shady_object, sym_remembered_shady_object_limit;
+static VALUE sym_total_allocated_objects, sym_heap_swept_slots, sym_heap_tomb_pages, sym_heap_final_slots;
+static VALUE sym_old_objects, sym_old_objects_limit, sym_remembered_wb_unprotected_objects, sym_remembered_wb_unprotected_objects_limit;
 static VALUE sym_major_by, sym_count, sym_major_count, sym_minor_count, sym_sweep_count, minor_gc_args;
 static    ID id_start;
 
@@ -45,8 +46,8 @@ gc_event_i(VALUE tpval, void *data)
   switch (flag) {
     case RUBY_INTERNAL_EVENT_GC_START:
       _oobgc.allocation_limit = 0;
-      _oobgc.start.total_allocated_object = rb_gc_stat(sym_total_allocated_object);
-      _oobgc.start.heap_tomb_page_length = rb_gc_stat(sym_heap_tomb_page_length);
+      _oobgc.start.total_allocated_objects = rb_gc_stat(sym_total_allocated_objects);
+      _oobgc.start.heap_tomb_pages = rb_gc_stat(sym_heap_tomb_pages);
       break;
 
     case RUBY_INTERNAL_EVENT_GC_END_MARK:
@@ -56,10 +57,10 @@ gc_event_i(VALUE tpval, void *data)
     case RUBY_INTERNAL_EVENT_GC_END_SWEEP:
       _oobgc.sweep_needed = 0;
       _oobgc.allocation_limit =
-        _oobgc.start.total_allocated_object +
-        rb_gc_stat(sym_heap_swept_slot) +
-        (rb_gc_stat(sym_heap_tomb_page_length) * _oobgc.heap_obj_limit) -
-        rb_gc_stat(sym_heap_final_slot);
+        _oobgc.start.total_allocated_objects +
+        rb_gc_stat(sym_heap_swept_slots) +
+        (rb_gc_stat(sym_heap_tomb_pages) * _oobgc.heap_obj_limit) -
+        rb_gc_stat(sym_heap_final_slots);
       break;
   }
 }
@@ -106,7 +107,7 @@ gc_start_minor()
 static VALUE
 oobgc(VALUE self)
 {
-  size_t curr = rb_gc_stat(sym_total_allocated_object);
+  size_t curr = rb_gc_stat(sym_total_allocated_objects);
   if (!_oobgc.installed) install();
 
   if (!_oobgc.prev_allocated_object) {
@@ -135,11 +136,11 @@ oobgc(VALUE self)
     return Qtrue;
 
   } else if (_oobgc.allocation_limit) {
-    /* GC will be required when total_allocated_object gets
+    /* GC will be required when total_allocated_objects gets
      * close to allocation_limit
      */
-    if ((rb_gc_stat(sym_old_object) >= rb_gc_stat(sym_old_object_limit)*0.97 ||
-        rb_gc_stat(sym_remembered_shady_object) >= rb_gc_stat(sym_remembered_shady_object_limit)*0.97) &&
+    if ((rb_gc_stat(sym_old_objects) >= rb_gc_stat(sym_old_objects_limit)*0.97 ||
+        rb_gc_stat(sym_remembered_wb_unprotected_objects) >= rb_gc_stat(sym_remembered_wb_unprotected_objects_limit)*0.97) &&
         curr >= _oobgc.allocation_limit - _oobgc.threshold.max*0.98) {
       /*fprintf(stderr, "oobgc MAJOR: %zu >= %zu - %zu\n", curr, _oobgc.allocation_limit, _oobgc.threshold.max);*/
       gc_start_major();
@@ -185,24 +186,29 @@ Init_oobgc()
 {
   mOOB = rb_define_module_under(rb_mGC, "OOB");
   rb_autoload(mOOB, rb_intern_const("UnicornMiddleware"), "gctools/oobgc/unicorn_middleware.rb");
-  rb_autoload(mOOB, rb_intern_const("PumaMiddleware"), "gctools/oobgc/puma_middleware.rb");
 
   rb_define_singleton_method(mOOB, "setup", install, 0);
   rb_define_singleton_method(mOOB, "run", oobgc, 0);
   rb_define_singleton_method(mOOB, "stat", oobgc_stat, 1);
   rb_define_singleton_method(mOOB, "clear", oobgc_clear, 0);
 
-#define S(name) sym_##name = ID2SYM(rb_intern(#name));
-  S(total_allocated_object);
-  S(heap_swept_slot);
-  S(heap_tomb_page_length);
-  S(heap_final_slot);
-
-  S(old_object);
-  S(old_object_limit);
-  S(remembered_shady_object);
-  S(remembered_shady_object_limit);
+#if (RUBY_API_VERSION_MAJOR == 2) && (RUBY_API_VERSION_MINOR == 1)
+  #define S(name, legacy_name) sym_##name = ID2SYM(rb_intern(#legacy_name))
+#else
+  #define S(name, legacy_name) sym_##name = ID2SYM(rb_intern(#name))
+#endif
+  S(total_allocated_objects, total_allocated_object);
+  S(heap_swept_slots, heap_swept_slot);
+  S(heap_tomb_pages, heap_tomb_page_length);
+  S(heap_final_slots, heap_final_slot);
+
+  S(old_objects, old_object);
+  S(old_objects_limit, old_object_limit);
+  S(remembered_wb_unprotected_objects, remembered_shady_object);
+  S(remembered_wb_unprotected_objects_limit, remembered_shady_object_limit);
+#undef S
 
+#define S(name) sym_##name = ID2SYM(rb_intern(#name))
   S(major_by);
   S(count);
   S(major_count);

data/gctools.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'gctools'
-  s.version = '0.2.3'
+  s.version = '0.2.4'
   s.summary = 'rgengc tools for ruby 2.1+'
   s.description = 'gc debugger, logger and profiler for rgengc in ruby 2.1'
 
@@ -12,4 +12,5 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.extensions = ['ext/gcprof/extconf.rb', 'ext/oobgc/extconf.rb']
   s.add_development_dependency 'rake-compiler', '~> 0.9'
+  s.add_development_dependency 'minitest', '~> 5.0'
 end

data/test/test_gcprof.rb

@@ -1,7 +1,7 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'gctools/gcprof'
 
-class TestGCProf < Test::Unit::TestCase
+class TestGCProf < Minitest::Test
   def teardown
     GCProf.after_gc_hook = nil
   end

data/test/test_oobgc.rb

@@ -1,8 +1,10 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'gctools/oobgc'
 require 'json'
 
-class TestOOBGC < Test::Unit::TestCase
+class TestOOBGC < Minitest::Test
+  HEAP_SWEPT_SLOTS_KEY = RUBY_VERSION >= "2.2" ? :heap_swept_slots : :heap_swept_slot
+
   def setup
     GC::OOB.setup
     GC::OOB.clear
@@ -12,9 +14,9 @@ class TestOOBGC < Test::Unit::TestCase
     GC.start(immediate_sweep: false)
     assert_equal false, GC.latest_gc_info(:immediate_sweep)
 
-    before = GC.stat(:heap_swept_slot)
+    before = GC.stat(HEAP_SWEPT_SLOTS_KEY)
     assert_equal true, GC::OOB.run
-    assert_operator GC.stat(:heap_swept_slot), :>, before
+    assert_operator GC.stat(HEAP_SWEPT_SLOTS_KEY), :>, before
   end
 
   def test_oob_mark

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: gctools
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Aman Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: gc debugger, logger and profiler for rgengc in ruby 2.1
 email: aman@tmm1.net
 executables: []
@@ -32,9 +46,10 @@ extensions:
 - ext/oobgc/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - ext/gcprof/extconf.rb
@@ -43,7 +58,6 @@ files:
 - ext/oobgc/oobgc.c
 - gctools.gemspec
 - lib/gctools/logger.rb
-- lib/gctools/oobgc/puma_middleware.rb
 - lib/gctools/oobgc/unicorn_middleware.rb
 - test/test_gcprof.rb
 - test/test_oobgc.rb
@@ -57,19 +71,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: rgengc tools for ruby 2.1+
 test_files: []
-has_rdoc: 

data/lib/gctools/oobgc/puma_middleware.rb

@@ -1,16 +0,0 @@
-require 'gctools/oobgc'
-
-module GC
-  module OOB
-    class PumaMiddleware
-      def initialize(app, name = nil)
-        @app = app
-      end
-      def call(env)
-        status, header, body = @app.call(env)
-        env['rack.after_reply'] << lambda { GC::OOB.run }
-        [status, header, body]
-      end
-    end
-  end
-end