rallhook 0.7.1 → 0.7.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.7.2	Fixed issue 9 by ruby-wrapping properly the rallhook thread info including the garbage collector mark function of 
+		the ruby wrapper
+
+		Removed hotfix of issue 9 improved in version 0.7.1, thread support restored
+
 0.7.1	Fixed issue 9 ( http://github.com/tario/rallhook/issues#issue/9 ), "broken" object is processed by the GC due the impossibility of avoid 
 		the deletion of an object of class Redirect returned by handle_method. The hotfix disabled the GC at each redirection and enable
 		it again each time that a WRAPPER redirection concludes. Also the GC are re-enabled when the hook block is terminated. 

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/gempackagetask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'rallhook'
-  s.version = '0.7.1'
+  s.version = '0.7.2'
   s.author = 'Dario Seminara'
   s.email = 'robertodarioseminara@gmail.com'
   s.platform = Gem::Platform::RUBY

data/ext/rallhook_base/rallhook.c

@@ -72,6 +72,11 @@ typedef struct AttachedThreadInfo_ {
 	int handle_method_arity;
 } AttachedThreadInfo;
 
+
+void tinfo_mark(AttachedThreadInfo* tinfo) {
+	rb_gc_mark(tinfo->hook_proc);
+}
+
 AttachedThreadInfo* tinfo_from_thread(VALUE thread) {
 	VALUE tmp = rb_ivar_get( thread, rb_intern("__tinfo") );
 
@@ -81,11 +86,17 @@ AttachedThreadInfo* tinfo_from_thread(VALUE thread) {
 		tinfo->hook_enable_left = 0;
 		tinfo->hook_proc = Qnil;
 
-		rb_ivar_set( thread, rb_intern("__tinfo"), (VALUE)tinfo);
+		VALUE tinfo_obj = Data_Make_Struct(rb_cObject, AttachedThreadInfo, tinfo_mark, free, tinfo);
+
+		rb_ivar_set( thread, rb_intern("__tinfo"), tinfo_obj);
 
 		return tinfo;
 	} else {
-		return (AttachedThreadInfo*)tmp;
+
+		AttachedThreadInfo* tinfo;
+		Data_Get_Struct(tmp, AttachedThreadInfo, tinfo);
+
+		return tinfo;
 	}
 }
 
@@ -117,12 +128,6 @@ VALUE get_hook_proc() {
 Disable the hook. Is not usually necesary because of the RAII feature of Hook#hook
 */
 VALUE unhook(VALUE self) {
-	disable_redirect(tinfo_from_thread( rb_thread_current() ) );
-	rb_gc_enable();
-	return Qnil;
-}
-
-VALUE restore_unhook(VALUE self) {
 	disable_redirect(tinfo_from_thread( rb_thread_current() ) );
 	return Qnil;
 }
@@ -197,9 +202,6 @@ void rallhook_redirect_handler ( VALUE* klass, VALUE* recv, ID* mid ) {
 
 		// method named "binding" cannot be redirected
 		if (rb_obj_is_kind_of(result,rb_mMethodRedirect) == Qtrue ) {
-
-			rb_gc_disable();
-
 			*klass = rb_ivar_get(result,id_klass_var );
 			*recv = rb_ivar_get(result,id_recv_var );
 			*mid = rb_to_id( rb_ivar_get(result,id_method_var) );
@@ -266,7 +268,7 @@ If no call to Hook#hook has made, rehook does nothing
 VALUE rehook(VALUE unused) {
 	enable_redirect(tinfo_from_thread( rb_thread_current() ));
 	if (rb_block_given_p() ) {
-		return rb_ensure(rb_yield, Qnil, restore_unhook, Qnil);
+		return rb_ensure(rb_yield, Qnil, unhook, Qnil);
 	}
 	return Qnil;
 }

data/lib/rallhook.rb

@@ -40,7 +40,7 @@ module RallHook
 #
   class Redirect
 		include MethodRedirect
-
+		
 		attr_reader :recv
 
 		def initialize(klass, recv, m, unhook = nil)
@@ -225,8 +225,7 @@ module RallHook
           call(*args)
         end
       ensure
-        GC.enable
-        ::RallHook::Hook.rehook
+        rehook
       end
 
 #
@@ -326,11 +325,6 @@ class Object
 # Anyway, it is desirable to use MethodWrapper instead to "wrap" method calls
 #
 # see RallHook::Helper::MethodWrapper
-#
-# NOTE: Rallhook internally disable the GC in a redirection, you must reactivate it after
-#
-# NOTE 2: If use the MethodWrapper functionallity, it reactivates the GC disabled by rallhook. You should not
-# worry about it
 #
   def redirect_with_unhook(method_name, klass = nil)
     if klass
@@ -364,7 +358,6 @@ class Object
 #
 #   # hook using MethodHandler, etc... (see README and examples)
 #
-# NOTE: Rallhook internally disable the GC in a redirection, you must reactivate it after
 #
   def redirect(method_name, klass = nil)
 		if klass

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rallhook
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Dario Seminara
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-21 00:00:00 -03:00
+date: 2010-06-25 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency