utilrb 1.2 → 1.3

data/History.txt

@@ -1,3 +1,8 @@
+=== Version 1.3
+
+* added Utilrb::WeakRef, a much leaner version of the standard WeakRef:
+  implemented in C++, not a subclass of Delegate (delegate is very costly)
+
 === Version 1.2
 
 * compatibility with ruby 1.9. Some feature are specific 1.8:

data/Manifest.txt

@@ -65,6 +65,7 @@ lib/utilrb/time/to_hms.rb
 lib/utilrb/unbound_method.rb
 lib/utilrb/unbound_method/call.rb
 lib/utilrb/value_set.rb
+patches/gc_live_objects.patch
 test/data/test_pkgconfig.pc
 test/test_array.rb
 test/test_config.rb

data/ext/utilrb_ext.cc

@@ -8,6 +8,8 @@
 #include "ruby_internals-1.8.h"
 #endif
 
+static VALUE mUtilrb;
+
 using namespace std;
 
 static VALUE enumerable_each_uniq_i(VALUE i, VALUE* memo)
@@ -116,11 +118,17 @@ static VALUE proc_line(VALUE self)
 
 #endif
 
+static VALUE kernel_is_immediate(VALUE klass, VALUE object)
+{ return IMMEDIATE_P(object) ? Qtrue : Qfalse; }
+
 extern "C" void Init_value_set();
 extern "C" void Init_swap();
+extern "C" void Init_weakref(VALUE mUtilrb);
 
 extern "C" void Init_utilrb_ext()
 {
+    mUtilrb = rb_define_module("Utilrb");
+
     rb_define_method(rb_mEnumerable, "each_uniq", RUBY_METHOD_FUNC(enumerable_each_uniq), 0);
     rb_define_method(rb_mKernel, "is_singleton?", RUBY_METHOD_FUNC(kernel_is_singleton_p), 0);
 #ifndef RUBY_IS_19
@@ -130,7 +138,10 @@ extern "C" void Init_utilrb_ext()
     rb_define_method(rb_cIO, "clearerr", RUBY_METHOD_FUNC(io_clearerr), 0);
 #endif
 
+    rb_define_singleton_method(rb_mKernel, "immediate?", RUBY_METHOD_FUNC(kernel_is_immediate), 1);
+
     Init_value_set();
     Init_swap();
+    Init_weakref(mUtilrb);
 }
 

data/lib/utilrb/common.rb

@@ -1,6 +1,6 @@
 module Utilrb
     unless defined? Utilrb::VERSION
-	VERSION = "1.2"
+	VERSION = "1.3"
 	RUBY_IS_19 = (RUBY_VERSION >= "1.9")
     end
 

data/patches/gc_live_objects.patch

@@ -0,0 +1,71 @@
+--- gc.c	2006-08-25 10:12:46.000000000 +0200
++++ gc.c.new	2007-01-13 12:39:38.383681000 +0100
+@@ -88,6 +88,8 @@ static void run_final();
+ static VALUE nomem_error;
+ static void garbage_collect();
+ 
++static unsigned long live_objects = 0;
++
+ void
+ rb_memerror()
+ {
+@@ -401,6 +398,7 @@ rb_newobj()
+     RANY(obj)->file = ruby_sourcefile;
+     RANY(obj)->line = ruby_sourceline;
+ #endif
++    live_objects++;
+     return obj;
+ }
+ 
+@@ -1053,8 +1051,8 @@ gc_sweep()
+     RVALUE *p, *pend, *final_list;
+     int freed = 0;
+     int i;
+-    unsigned long live = 0;
+     unsigned long free_min = 0;
++    live_objects = 0;
+ 
+     for (i = 0; i < heaps_used; i++) {
+         free_min += heaps[i].limit;
+@@ -1113,7 +1111,7 @@ gc_sweep()
+ 	    }
+ 	    else {
+ 		RBASIC(p)->flags &= ~FL_MARK;
+-		live++;
++		live_objects++;
+ 	    }
+ 	    p++;
+ 	}
+@@ -1131,7 +1129,7 @@ gc_sweep()
+ 	}
+     }
+     if (malloc_increase > malloc_limit) {
+-	malloc_limit += (malloc_increase - malloc_limit) * (double)live / (live + freed);
++	malloc_limit += (malloc_increase - malloc_limit) * (double)live_objects / (live_objects + freed);
+ 	if (malloc_limit < GC_MALLOC_LIMIT) malloc_limit = GC_MALLOC_LIMIT;
+     }
+     malloc_increase = 0;
+@@ -2003,6 +2001,15 @@ rb_obj_id(VALUE obj)
+     return (VALUE)((long)obj|FIXNUM_FLAG);
+ }
+ 
++/* call-seq:
++ *  GC.live_objects => number
++ *
++ * Returns the count of objects currently allocated
++ */
++static
++VALUE rb_gc_live_objects(VALUE self)
++{ return INT2FIX(live_objects); }
++
+ /*
+  *  The <code>GC</code> module provides an interface to Ruby's mark and
+  *  sweep garbage collection mechanism. Some of the underlying methods
+@@ -2027,6 +2034,7 @@ Init_GC()
+     rb_define_module_function(rb_mObSpace, "remove_finalizer", rm_final, 1);
+     rb_define_module_function(rb_mObSpace, "finalizers", finals, 0);
+     rb_define_module_function(rb_mObSpace, "call_finalizer", call_final, 1);
++    rb_define_module_function(rb_mObSpace, "live_objects", rb_gc_live_objects, 0);
+ 
+     rb_define_module_function(rb_mObSpace, "define_finalizer", define_final, -1);
+     rb_define_module_function(rb_mObSpace, "undefine_finalizer", undefine_final, 1);

data/test/test_pkgconfig.rb

@@ -8,7 +8,7 @@ class TC_PkgConfig < Test::Unit::TestCase
 	ENV['PKG_CONFIG_PATH'] = File.join(File.expand_path(File.dirname(__FILE__)), 'data')
     end
     def teardown
-	ENV['PKG_CONFIG_PATH'] = @old_pkg_config_path
+	ENV.delete('PKG_CONFIG_PATH')
     end
 
     PkgConfig = Utilrb::PkgConfig

data/test/test_weakref.rb

@@ -0,0 +1,55 @@
+require 'test/unit/testcase'
+require 'utilrb/weakref'
+
+Utilrb.require_ext('TC_WeakRef') do
+    class TC_WeakRef < Test::Unit::TestCase
+        WeakRef = Utilrb::WeakRef
+        def test_normal
+            obj = Object.new
+            ref = Utilrb::WeakRef.new(obj)
+
+            assert_equal(obj, ref.get)
+        end
+
+        def test_initialize_validation
+            assert_raises(ArgumentError) { Utilrb::WeakRef.new(nil) }
+            assert_raises(ArgumentError) { Utilrb::WeakRef.new(5) }
+
+            ref = WeakRef.new(Object.new)
+            assert_raises(ArgumentError) { Utilrb::WeakRef.new(ref) }
+        end
+
+        def create_deep_ref(lvl)
+            if lvl == 0
+                obj = Object.new
+                refs = (1..100).map { WeakRef.new(obj) }
+                return refs, obj.object_id
+            else
+                create_deep_ref(lvl - 1)
+            end
+        end
+
+        def create_deep_obj(lvl)
+            if lvl == 0
+                ref = WeakRef.new(obj = Object.new)
+                return obj, ref.object_id
+            else
+                create_deep_obj(lvl - 1)
+            end
+        end
+
+        def test_finalization
+            refs, obj_id = create_deep_ref(100)
+            GC.start
+            for ref in refs
+                assert_raises(WeakRef::RefError) { ref.get }
+            end
+            assert_equal(nil, WeakRef.refcount(obj_id))
+
+            obj, ref_id = create_deep_obj(100)
+            GC.start
+            assert_raises(RangeError) { ObjectSpace._id2ref(ref_id) }
+        end
+    end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: utilrb
 version: !ruby/object:Gem::Version 
-  version: "1.2"
+  version: "1.3"
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-07 00:00:00 +02:00
+date: 2008-06-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,7 +37,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.5.3
     version: 
 description: == What is Utilrb ? Utilrb is yet another Ruby toolkit, in the spirit of facets. It includes all the standard class extensions I use in my own projects like Genom.rb.  == Installation The only dependency Utilrb has is flexmock if you want to run tests. It is available as a gem, so you can run  gem install flexmock  == Utilrb's C extension Utilrb includes a C extension in ext/. It is optional, but some of the functionalities will be disabled if it is not present. Trying to require a file in which there is a C-only feature will yield a warning on STDOUT.
 email: 
@@ -119,6 +119,7 @@ files:
 - lib/utilrb/unbound_method.rb
 - lib/utilrb/unbound_method/call.rb
 - lib/utilrb/value_set.rb
+- patches/gc_live_objects.patch
 - test/data/test_pkgconfig.pc
 - test/test_array.rb
 - test/test_config.rb
@@ -180,6 +181,7 @@ test_files:
 - test/test_gc.rb
 - test/test_array.rb
 - test/test_enumerable.rb
+- test/test_weakref.rb
 - test/test_hash.rb
 - test/test_objectstats.rb
 - test/test_pkgconfig.rb