ruby-internal 0.8.4 → 0.8.5

data/ext/internal/thread/extconf.rb

@@ -1,3 +1,4 @@
 $: << '../../'
 require 'mkmf-ruby-internal'
+have_type('struct RTypedData')
 create_ruby_internal_makefile 'internal/thread/thread'

data/ext/internal/thread/thread.c

@@ -8,6 +8,22 @@
 
 #ifdef RUBY_VM
 
+#ifdef HAVE_TYPE_STRUCT_RTYPEDDATA
+
+#  undef GetThreadPtr
+#  define GetThreadPtr(obj, ptr) \
+   TypedData_Get_Struct((obj), rb_thread_t, p_ruby_threadptr_data_type, (ptr))
+
+  static rb_data_type_t const * p_ruby_threadptr_data_type;
+
+  static void init_ruby_threadptr_data_type()
+  {
+    VALUE thread = rb_thread_current();
+    p_ruby_threadptr_data_type = RTYPEDDATA_TYPE(thread);
+  }
+
+#endif
+
 static VALUE rb_cVmControlFrame;
 
 /* TODO: also defined in control_frame.c */
@@ -109,5 +125,9 @@ void Init_thread(void)
 
   rb_define_method(rb_cThread, "cfp", thread_cfp, 0);
 #endif
+
+#ifdef HAVE_TYPE_STRUCT_RTYPEDDATA
+  init_ruby_threadptr_data_type();
+#endif
 }
 

data/ext/internal/vm/control_frame/control_frame.c

@@ -5,6 +5,22 @@
 
 #include "vm_core.h"
 
+#ifdef HAVE_TYPE_STRUCT_RTYPEDDATA
+
+#  undef GetThreadPtr
+#  define GetThreadPtr(obj, ptr) \
+   TypedData_Get_Struct((obj), rb_thread_t, p_ruby_threadptr_data_type, (ptr))
+
+  static rb_data_type_t const * p_ruby_threadptr_data_type;
+
+  static void init_ruby_threadptr_data_type()
+  {
+    VALUE thread = rb_thread_current();
+    p_ruby_threadptr_data_type = RTYPEDDATA_TYPE(thread);
+  }
+
+#endif
+
 /* TODO: Using this class is dangerous, because the control frame can be
  * popped but a reference kept around to it.  It will still point to
  * valid memory, but the data itself will be invalid.
@@ -199,5 +215,9 @@ void Init_control_frame(void)
   rb_define_method(rb_cVmControlFrame, "method_class", control_frame_method_class, 0);
   rb_define_method(rb_cVmControlFrame, "prev", control_frame_prev, 0);
 #endif
+
+#ifdef HAVE_TYPE_STRUCT_RTYPEDDATA
+  init_ruby_threadptr_data_type();
+#endif
 }
 

data/ext/internal/vm/control_frame/extconf.rb

@@ -4,4 +4,6 @@ require 'mkmf-ruby-internal'
 ruby_version_code = RUBY_VERSION.gsub(/\./, '').to_i
 $CPPFLAGS << " -DRUBY_VERSION_CODE=#{ruby_version_code}"
 
+have_type('struct RTypedData')
+
 create_ruby_internal_makefile 'internal/vm/control_frame/control_frame'

data/test/test_module.rb

@@ -38,8 +38,6 @@ class TC_Module < Test::Unit::TestCase
     klass.class_eval do
       add_method(:foo, n, Noex::PUBLIC)
     end
-    p klass.methods.sort
-    p klass.instance_methods.sort
     obj = klass.new
     assert_equal 42, obj.foo
   end

data/test/test_thread.rb

@@ -0,0 +1,25 @@
+require 'test/unit'
+require 'rbconfig'
+
+dir = File.dirname(__FILE__)
+$:.unshift(dir) if not $:.include?(dir)
+$:.unshift("#{dir}/../lib") if not $:.include?("#{dir}/../lib")
+$:.unshift("#{dir}/../ext") if not $:.include?("#{dir}/../ext")
+
+require 'internal/thread'
+
+$stdout.sync = true
+$stderr.sync = true
+
+class TC_Thread < Test::Unit::TestCase
+  def test_thread_cfp
+    return if not defined?(RubyVM)
+
+    cfp = Thread.current.cfp
+  end
+end
+
+if __FILE__ == $0 then
+  exit Test::Unit::AutoRunner.run
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-internal
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypp
@@ -361,6 +361,7 @@ files:
 - test/test_method.rb
 - test/node_samples.rb
 - test/test_node.rb
+- test/test_thread.rb
 - test/test_module.rb
 - test/test_dump_class.rb
 - pre-install.rb
@@ -416,5 +417,6 @@ test_files:
 - test/test_helpers.rb
 - test/test_method.rb
 - test/test_node.rb
+- test/test_thread.rb
 - test/test_module.rb
 - test/test_dump_class.rb