cast_off 0.2.1 → 0.2.3

data/ext/cast_off/ruby_source/1.9.3/manual_update.h

@@ -0,0 +1,135 @@
+/* ----- string.c ----- */
+#define STR_TMPLOCK FL_USER7
+#define STR_NOEMBED FL_USER1
+#define STR_SHARED  FL_USER2 /* = ELTS_SHARED */
+#define STR_ASSOC   FL_USER3
+#define STR_SHARED_P(s) FL_ALL((s), STR_NOEMBED|ELTS_SHARED)
+#define STR_ASSOC_P(s)  FL_ALL((s), STR_NOEMBED|STR_ASSOC)
+#define STR_NOCAPA  (STR_NOEMBED|ELTS_SHARED|STR_ASSOC)
+#define STR_NOCAPA_P(s) (FL_TEST((s),STR_NOEMBED) && FL_ANY((s),ELTS_SHARED|STR_ASSOC))
+
+/* ----- vm.c ----- */
+static rb_control_frame_t *
+vm_get_ruby_level_caller_cfp(rb_thread_t *th, rb_control_frame_t *cfp)
+{
+    if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) {
+	return cfp;
+    }
+
+    cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+
+    while (!RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(th, cfp)) {
+	if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) {
+	    return cfp;
+	}
+
+	if ((cfp->flag & VM_FRAME_FLAG_PASSED) == 0) {
+	    break;
+	}
+	cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+    }
+    return 0;
+}
+
+static VALUE
+make_localjump_error(const char *mesg, VALUE value, int reason)
+{
+    extern VALUE rb_eLocalJumpError;
+    VALUE exc = rb_exc_new2(rb_eLocalJumpError, mesg);
+    ID id;
+
+    switch (reason) {
+      case TAG_BREAK:
+	CONST_ID(id, "break");
+	break;
+      case TAG_REDO:
+	CONST_ID(id, "redo");
+	break;
+      case TAG_RETRY:
+	CONST_ID(id, "retry");
+	break;
+      case TAG_NEXT:
+	CONST_ID(id, "next");
+	break;
+      case TAG_RETURN:
+	CONST_ID(id, "return");
+	break;
+      default:
+	CONST_ID(id, "noreason");
+	break;
+    }
+    rb_iv_set(exc, "@exit_value", value);
+    rb_iv_set(exc, "@reason", ID2SYM(id));
+    return exc;
+}
+
+void
+rb_vm_localjump_error(const char *mesg, VALUE value, int reason)
+{
+    VALUE exc = make_localjump_error(mesg, value, reason);
+    rb_exc_raise(exc);
+}
+
+/* ----- vm_method.c ----- */
+static rb_method_entry_t*
+search_method(VALUE klass, ID id)
+{
+    st_data_t body;
+    if (!klass) {
+	return 0;
+    }
+
+    while (!st_lookup(RCLASS_M_TBL(klass), id, &body)) {
+	klass = RCLASS_SUPER(klass);
+	if (!klass) {
+	    return 0;
+	}
+    }
+
+    return (rb_method_entry_t *)body;
+}
+
+static int
+rb_method_definition_eq(const rb_method_definition_t *d1, const rb_method_definition_t *d2)
+{
+    if (d1 == d2) return 1;
+    if (!d1 || !d2) return 0;
+    if (d1->type != d2->type) {
+	return 0;
+    }
+    switch (d1->type) {
+      case VM_METHOD_TYPE_ISEQ:
+	return d1->body.iseq == d2->body.iseq;
+      case VM_METHOD_TYPE_CFUNC:
+	return
+	  d1->body.cfunc.func == d2->body.cfunc.func &&
+	  d1->body.cfunc.argc == d2->body.cfunc.argc;
+      case VM_METHOD_TYPE_ATTRSET:
+      case VM_METHOD_TYPE_IVAR:
+	return d1->body.attr.id == d2->body.attr.id;
+      case VM_METHOD_TYPE_BMETHOD:
+	return RTEST(rb_equal(d1->body.proc, d2->body.proc));
+      case VM_METHOD_TYPE_MISSING:
+	return d1->original_id == d2->original_id;
+      case VM_METHOD_TYPE_ZSUPER:
+      case VM_METHOD_TYPE_NOTIMPLEMENTED:
+      case VM_METHOD_TYPE_UNDEF:
+	return 1;
+      case VM_METHOD_TYPE_OPTIMIZED:
+	return d1->body.optimize_type == d2->body.optimize_type;
+      default:
+	rb_bug("rb_method_entry_eq: unsupported method type (%d)\n", d1->type);
+	return 0;
+    }
+}
+
+int
+rb_method_entry_eq(const rb_method_entry_t *m1, const rb_method_entry_t *m2)
+{
+    return rb_method_definition_eq(m1->def, m2->def);
+}
+
+/* ----- set noinline ----- */
+NOINLINE(static rb_control_frame_t *vm_get_ruby_level_caller_cfp(rb_thread_t *th, rb_control_frame_t *cfp));
+NOINLINE(static rb_method_entry_t* search_method(VALUE klass, ID id));
+

data/lib/cast_off/compile.rb

@@ -32,9 +32,10 @@ module CastOff
         @@autoload_proc.call()
         return true 
       end
-      return true if load()
 
-      compiled = nil
+      # Marshal.load で定数を参照したときに、クラス定義が走る可能性があるので、
+      # @@autoload_proc を定義する前に、Marshal.load を呼び出しておく。
+      compiled = CodeManager.load_autocompiled()
       @@autoload_proc = lambda {
         compiled = CodeManager.load_autocompiled() unless compiled
         return false unless compiled
@@ -42,7 +43,8 @@ module CastOff
         hook_class_definition_end(nil) if fin
         fin
       }
-      hook_class_definition_end(@@autoload_proc)
+      hook_class_definition_end(@@autoload_proc) if RUBY_VERSION == "1.9.3"
+      @@autoload_proc.call()
       true
     end
 
@@ -61,7 +63,15 @@ module CastOff
     end
 
     @@autocompile_proc = nil
-    @@compile_auto_incremental = true
+    case RUBY_VERSION
+    when "1.9.3"
+      @@compile_auto_incremental = true
+    when "1.9.2"
+      @@compile_auto_incremental = false
+    else
+      bug()
+    end
+
     def autocompile()
       return false if autoload_running?
       return true if autocompile_running?
@@ -145,24 +155,26 @@ module CastOff
     end
 
     def compile(target, mid, bind_or_typemap = nil, typemap = nil)
-      case target
-      when Class, Module
-        # ok
-      else
-        raise(ArgumentError.new("first argument should be Class or Module"))
+      execute_no_hook() do
+        case target
+        when Class, Module
+          # ok
+        else
+          raise(ArgumentError.new("first argument should be Class or Module"))
+        end
+        mid, bind, typemap = parse_arguments(mid, bind_or_typemap, typemap)
+        t = override_target(target, mid)
+        iseq = @@original_instance_method_iseq[[t, mid]] || get_iseq(target, mid, false)
+        manager, configuration, suggestion = compile_iseq(iseq, mid, typemap, false, bind)
+        manager.compilation_target_is_a(t, mid, false)
+        set_direct_call(target, mid, target.instance_of?(Class) ? :class : :module, manager, configuration)
+        load_binary(manager, configuration, suggestion, iseq, bind)
+        t = override_target(target, mid)
+        dlog("override target of #{target}##{mid} is #{t}")
+        __send__("register_method_#{manager.signiture}", t)
+        @@original_instance_method_iseq[[t, mid]] = iseq
+        @@manager_table[manager.signiture] = manager
       end
-      mid, bind, typemap = parse_arguments(mid, bind_or_typemap, typemap)
-      t = override_target(target, mid)
-      iseq = @@original_instance_method_iseq[[t, mid]] || get_iseq(target, mid, false)
-      manager, configuration, suggestion = compile_iseq(iseq, mid, typemap, false, bind)
-      manager.compilation_target_is_a(t, mid, false)
-      set_direct_call(target, mid, target.instance_of?(Class) ? :class : :module, manager, configuration)
-      load_binary(manager, configuration, suggestion, iseq, bind)
-      t = override_target(target, mid)
-      dlog("override target of #{target}##{mid} is #{t}")
-      __send__("register_method_#{manager.signiture}", t)
-      @@original_instance_method_iseq[[t, mid]] = iseq
-      @@manager_table[manager.signiture] = manager
       true
     end
 
@@ -172,15 +184,17 @@ module CastOff
     end
 
     def compile_singleton_method(obj, mid, bind_or_typemap = nil, typemap = nil)
-      mid, bind, typemap = parse_arguments(mid, bind_or_typemap, typemap)
-      iseq = @@original_singleton_method_iseq[[obj, mid]] || get_iseq(obj, mid, true)
-      manager, configuration, suggestion = compile_iseq(iseq, mid, typemap, false, bind)
-      manager.compilation_target_is_a(obj, mid, true)
-      set_direct_call(obj, mid, :singleton, manager, configuration)
-      load_binary(manager, configuration, suggestion, iseq, bind)
-      __send__("register_singleton_method_#{manager.signiture}", obj)
-      @@original_singleton_method_iseq[[obj, mid]] = iseq
-      @@manager_table[manager.signiture] = manager
+      execute_no_hook() do
+        mid, bind, typemap = parse_arguments(mid, bind_or_typemap, typemap)
+        iseq = @@original_singleton_method_iseq[[obj, mid]] || get_iseq(obj, mid, true)
+        manager, configuration, suggestion = compile_iseq(iseq, mid, typemap, false, bind)
+        manager.compilation_target_is_a(obj, mid, true)
+        set_direct_call(obj, mid, :singleton, manager, configuration)
+        load_binary(manager, configuration, suggestion, iseq, bind)
+        __send__("register_singleton_method_#{manager.signiture}", obj)
+        @@original_singleton_method_iseq[[obj, mid]] = iseq
+        @@manager_table[manager.signiture] = manager
+      end
       true
     end
 
@@ -190,25 +204,46 @@ module CastOff
       iseq = get_iseq_from_block(block)
       key = iseq.__id__
       if !@@loaded_binary[key]
-        bind = block.binding
-        manager, configuration, suggestion = compile_iseq(iseq, nil, typemap, false, bind)
-        load_binary(manager, configuration, suggestion, iseq, bind)
-        @@loaded_binary[key] = manager.signiture
+        execute_no_hook() do
+          bind = block.binding
+          manager, configuration, suggestion = compile_iseq(iseq, nil, typemap, false, bind)
+          load_binary(manager, configuration, suggestion, iseq, bind)
+          @@loaded_binary[key] = manager.signiture
+        end
       end
       sign = @@loaded_binary[key]
       recv = get_caller()
       __send__(sign, recv)
     end
 
+    def autocompile_running?
+      !!@@autocompile_proc
+    end
+
+    def autoload_running?
+      !!@@autoload_proc
+    end
+
+    def compiler_running?
+      !!Thread.current[COMPILER_RUNNING_KEY]
+    end
+
     private
 
+    COMPILER_RUNNING_KEY = :CastOffCompilerRunning
+    def compiler_running(bool)
+      Thread.current[COMPILER_RUNNING_KEY] = bool
+    end
+
     def execute_no_hook()
       bug() unless block_given?
       begin
+        compiler_running(true)
         hook_m = hook_method_invocation(nil)
         hook_c = hook_class_definition_end(nil)
         yield
       ensure
+        compiler_running(false)
         if hook_m
           bug() unless autocompile_running?
           hook_method_invocation(@@autocompile_proc)
@@ -231,9 +266,7 @@ Currently, CastOff cannot compile method which source file is not exist.
       suggestion = Suggestion.new(iseq, @@suggestion_io)
       configuration = nil
       manager.do_atomically() do
-        execute_no_hook() do
-          configuration = __compile(iseq, manager, typemap || {}, mid, is_proc, bind, suggestion)
-        end
+        configuration = __compile(iseq, manager, typemap || {}, mid, is_proc, bind, suggestion)
       end
       bug() unless configuration.instance_of?(Configuration)
       [manager, configuration, suggestion]
@@ -295,8 +328,9 @@ Currently, CastOff cannot compile method which source file is not exist.
       manager.version_up()
       begin
         __send__(singleton ? 'compile_singleton_method' : 'compile', target, mid, ann)
+        vlog("re-compilation success: #{target}#{singleton ? '.' : '#'}#{mid}")
       rescue => e
-        vlog("re-compilation failed: #{target}#{singleton ? '.' : '#'}#{mid}")
+        vlog("re-compilation failed: #{target}#{singleton ? '.' : '#'}#{mid} => #{e}")
       end
       true
     end
@@ -304,7 +338,7 @@ Currently, CastOff cannot compile method which source file is not exist.
     class ReCompilation < StandardError; end
 
     def __compile(iseq, manager, annotation, mid, is_proc, bind, suggestion)
-      if reuse_compiled_binary? && !manager.target_file_updated?
+      if reuse_compiled_code? && !manager.target_file_updated?
         # already compiled
         if CastOff.development? || !CastOff.skip_configuration_check? || manager.last_configuration_enabled_development?
           conf = Configuration.new(annotation, bind)
@@ -370,33 +404,46 @@ Currently, CastOff cannot compile method which source file is not exist.
       conf
     end
 
+    @@skipped = []
     def __load(compiled)
       begin
-        compiled.dup.each do |entry|
+        (@@skipped + compiled.dup).each do |entry|
           klass, mid, singleton, file, line, bind = entry
           if @@blacklist.include?(mid)
             compiled.delete(entry)
             next
           end
           bind = bind.bind if bind
-          entry.pop # release BindingWrapper
+          skip = false
           if singleton
             iseq = @@original_singleton_method_iseq[[klass, mid]] || get_iseq(klass, mid, true)
           else
-            t = override_target(klass, mid)
-            iseq = @@original_instance_method_iseq[[t, mid]] || get_iseq(klass, mid, false)
+            begin
+              t = override_target(klass, mid)
+              iseq = @@original_instance_method_iseq[[t, mid]] || get_iseq(klass, mid, false)
+            rescue CompileError, UnsupportedError
+              @@skipped |= [entry]
+              dlog("skip: entry = #{entry}")
+              skip = true
+            end
           end
-          f, l = *iseq.to_a.slice(7, 2)
-          if f == file && l == line
+          f, l = *iseq.to_a.slice(7, 2) unless skip
+          if !skip && f == file && l == line
             begin
+              @@skipped.delete(entry)
               if singleton
                 CastOff.compile_singleton_method(klass, mid, bind)
               else
                 CastOff.compile(klass, mid, bind)
               end
               vlog("load #{klass}##{mid}")
-            rescue UnsupportedError
-              vlog("unsupported #{klass}##{mid}")
+            rescue ArgumentError => e
+              # dependency の Marshal.load に失敗
+              vlog("skip: entry = #{entry[0]}#{entry[2] ? '.' : '#'}#{entry[1]}, #{e}")
+              CodeManager.delete_from_compiled(entry)
+            rescue UnsupportedError => e
+              vlog("unsupported #{klass}##{mid} => #{e}")
+              CodeManager.delete_from_compiled(entry)
             end
           else
             dlog("iseq.filepath = #{f}, file = #{file}\niseq.line = #{l}, line = #{line}")
@@ -404,7 +451,7 @@ Currently, CastOff cannot compile method which source file is not exist.
           compiled.delete(entry)
         end
         if compiled.empty?
-          vlog("---------- load finish ----------")
+          vlog("---------- load finish ----------") if @@skipped.empty?
           true
         else
           false
@@ -415,12 +462,16 @@ Currently, CastOff cannot compile method which source file is not exist.
       end
     end
 
-    def autocompile_running?
-      !!@@autocompile_proc
+    s = class << BasicObject
+      self
     end
-
-    def autoload_running?
-      !!@@autoload_proc
+    continue_load = RUBY_VERSION != "1.9.3"
+    s.class_eval do
+      define_method(:method_added) do |mid|
+        if CastOff.autoload_running? && (!@@skipped.empty? || continue_load) && !CastOff.compiler_running?
+          continue_load &= !@@autoload_proc.call()
+        end
+      end
     end
 
     def __autocompile(klass, mid, bind_table, location_table, index)
@@ -428,6 +479,7 @@ Currently, CastOff cannot compile method which source file is not exist.
       return nil if klass.name =~ /CastOff/ # ここで弾いておかないと、__compile の require で __load が走る。
                                             # Namespace のほうはあらかじめ require しておくことで回避。
                                             # Namespace 以外は CastOff を含むので問題無し。
+      return nil if mid == :method_added || mid == :singleton_method_added
       if klass.instance_methods(false).include?(mid) || klass.private_instance_methods(false).include?(mid)
         singleton = false
       else
@@ -529,7 +581,7 @@ Currently, CastOff cannot compile method which source file is not exist.
       unless base_configuration
         last = manager.load_last_configuration()
         bind = last ? (last.bind ? last.bind.bind : nil) : nil
-               base_configuration = Configuration.new({}, bind)
+        base_configuration = Configuration.new({}, bind)
       end
       bug() unless base_configuration.instance_of?(Configuration)
       update_p = update_configuration(base_configuration, reciever_result, return_value_result)
@@ -604,20 +656,18 @@ Currently, CastOff cannot compile method which source file is not exist.
     end
 
     def load_binary(manager, configuration, suggestion, iseq, bind)
-      execute_no_hook() do
-        so = manager.compiled_binary
-        sign = manager.signiture
-        bug("#{so} is not exist") unless File.exist?(so)
-        load_compiled_file(so)
-        function_pointer_initializer = "initialize_fptr_#{sign}".intern
-        hook_method_override(manager, configuration, function_pointer_initializer)
-        __send__("register_iseq_#{sign}", iseq)
-        __send__("register_ifunc_#{sign}")
-        set_sampling_table(suggestion, manager, configuration)
-        suggestion.dump_at_exit()
-        __send__(function_pointer_initializer)
-        __send__("prefetch_constants_#{sign}", bind) if bind
-      end
+      so = manager.compiled_binary
+      sign = manager.signiture
+      bug("#{so} is not exist") unless File.exist?(so)
+      load_compiled_file(so)
+      function_pointer_initializer = "initialize_fptr_#{sign}".intern
+      hook_method_override(manager, configuration, function_pointer_initializer)
+      __send__("register_iseq_#{sign}", iseq)
+      __send__("register_ifunc_#{sign}")
+      set_sampling_table(suggestion, manager, configuration)
+      suggestion.dump_at_exit()
+      __send__(function_pointer_initializer)
+      __send__("prefetch_constants_#{sign}", bind) if bind
     end
 
     def capture_instruction()