nobu	2016-04-04 23:37:07 +0900 (Mon, 04 Apr 2016)

  New Revision: 54484

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54484

  Log:
    at_exit list
    
    * vm_core.h (rb_vm_struct): make at_exit a single linked list but
      not RArray, not to mark the registered functions by the write
      barrier.  based on the patches by Evan Phoenix.
      [ruby-core:73908] [Bug #12095]

  Added directories:
    trunk/ext/-test-/vm/
    trunk/test/-ext-/vm/
  Added files:
    trunk/ext/-test-/vm/at_exit.c
    trunk/ext/-test-/vm/extconf.rb
    trunk/test/-ext-/vm/test_at_exit.rb
  Modified files:
    trunk/ChangeLog
    trunk/vm.c
    trunk/vm_core.h
Index: vm.c
===================================================================
--- vm.c	(revision 54483)
+++ vm.c	(revision 54484)
@@ -468,20 +468,25 @@ rb_frame_pop(void) https://github.com/ruby/ruby/blob/trunk/vm.c#L468
 void
 ruby_vm_at_exit(void (*func)(rb_vm_t *))
 {
-    rb_ary_push((VALUE)&GET_VM()->at_exit, (VALUE)func);
+    rb_vm_t *vm = GET_VM();
+    rb_at_exit_list *nl = ALLOC(rb_at_exit_list);
+    nl->func = func;
+    nl->next = vm->at_exit;
+    vm->at_exit = nl;
 }
 
 static void
 ruby_vm_run_at_exit_hooks(rb_vm_t *vm)
 {
-    VALUE hook = (VALUE)&vm->at_exit;
+    rb_at_exit_list *l = vm->at_exit;
 
-    while (RARRAY_LEN(hook) > 0) {
-	typedef void rb_vm_at_exit_func(rb_vm_t*);
-	rb_vm_at_exit_func *func = (rb_vm_at_exit_func*)rb_ary_pop(hook);
+    while (l) {
+	rb_at_exit_list* t = l->next;
+	rb_vm_at_exit_func *func = l->func;
+	free(l);
+	l = t;
 	(*func)(vm);
     }
-    rb_ary_free(hook);
 }
 
 /* Env */
@@ -2172,8 +2177,6 @@ vm_init2(rb_vm_t *vm) https://github.com/ruby/ruby/blob/trunk/vm.c#L2177
     MEMZERO(vm, rb_vm_t, 1);
     rb_vm_living_threads_init(vm);
     vm->src_encoding_index = -1;
-    vm->at_exit.basic.flags = (T_ARRAY | RARRAY_EMBED_FLAG) & ~RARRAY_EMBED_LEN_MASK; /* len set 0 */
-    rb_obj_hide((VALUE)&vm->at_exit);
 
     vm_default_params_setup(vm);
 }
Index: test/-ext-/vm/test_at_exit.rb
===================================================================
--- test/-ext-/vm/test_at_exit.rb	(revision 0)
+++ test/-ext-/vm/test_at_exit.rb	(revision 54484)
@@ -0,0 +1,19 @@ https://github.com/ruby/ruby/blob/trunk/test/-ext-/vm/test_at_exit.rb#L1
+# frozen_string_literal: false
+class TestVM < Test::Unit::TestCase
+
+  # [Bug #12095]
+  def test_at_exit
+
+    assert_in_out_err([], <<-"end;", %w[begin end]) # do
+      require '-test-/vm/at_exit'
+      Bug::VM.register_at_exit(false)
+      1000.times do
+        Bug::VM.register_at_exit(nil)
+        ["x"]*1000
+      end
+      GC.start
+      Bug::VM.register_at_exit(true)
+    end;
+  end
+end
+

Property changes on: test/-ext-/vm/test_at_exit.rb
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: ext/-test-/vm/extconf.rb
===================================================================
--- ext/-test-/vm/extconf.rb	(revision 0)
+++ ext/-test-/vm/extconf.rb	(revision 54484)
@@ -0,0 +1 @@
+create_makefile('-test-/vm/at_exit')

Property changes on: ext/-test-/vm/extconf.rb
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: ext/-test-/vm/at_exit.c
===================================================================
--- ext/-test-/vm/at_exit.c	(revision 0)
+++ ext/-test-/vm/at_exit.c	(revision 54484)
@@ -0,0 +1,44 @@ https://github.com/ruby/ruby/blob/trunk/ext/-test-/vm/at_exit.c#L1
+#include <ruby/ruby.h>
+#include <ruby/vm.h>
+
+static void
+do_nothing(ruby_vm_t *vm)
+{
+}
+
+static void
+print_begin(ruby_vm_t *vm)
+{
+    printf("begin\n");
+}
+
+static void
+print_end(ruby_vm_t *vm)
+{
+    printf("end\n");
+}
+
+static VALUE
+register_at_exit(VALUE self, VALUE t)
+{
+    switch (t) {
+      case Qtrue:
+	ruby_vm_at_exit(print_begin);
+	break;
+      case Qfalse:
+	ruby_vm_at_exit(print_end);
+	break;
+      default:
+	ruby_vm_at_exit(do_nothing);
+	break;
+    }
+    return self;
+}
+
+void
+Init_at_exit(void)
+{
+    VALUE m = rb_define_module("Bug");
+    VALUE c = rb_define_class_under(m, "VM", rb_cObject);
+    rb_define_singleton_method(c, "register_at_exit", register_at_exit, 1);
+}

Property changes on: ext/-test-/vm/at_exit.c
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 54483)
+++ ChangeLog	(revision 54484)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Apr  4 23:37:05 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* vm_core.h (rb_vm_struct): make at_exit a single linked list but
+	  not RArray, not to mark the registered functions by the write
+	  barrier.  based on the patches by Evan Phoenix.
+	  [ruby-core:73908] [Bug #12095]
+
 Mon Apr  4 17:43:45 2016  Koichi Sasada  <ko1@a...>
 
 	* gc.c: change deafult value of
Index: vm_core.h
===================================================================
--- vm_core.h	(revision 54483)
+++ vm_core.h	(revision 54484)
@@ -462,6 +462,14 @@ enum ruby_basic_operators { https://github.com/ruby/ruby/blob/trunk/vm_core.h#L462
 #define GetVMPtr(obj, ptr) \
   GetCoreDataFromValue((obj), rb_vm_t, (ptr))
 
+struct rb_vm_struct;
+typedef void rb_vm_at_exit_func(struct rb_vm_struct*);
+
+typedef struct rb_at_exit_list {
+    rb_vm_at_exit_func *func;
+    struct rb_at_exit_list *next;
+} rb_at_exit_list;
+
 struct rb_objspace;
 struct rb_objspace *rb_objspace_alloc(void);
 void rb_objspace_free(struct rb_objspace *);
@@ -530,11 +538,7 @@ typedef struct rb_vm_struct { https://github.com/ruby/ruby/blob/trunk/vm_core.h#L538
 
     struct rb_objspace *objspace;
 
-    /*
-     * @shyouhei notes that this is not for storing normal Ruby
-     * objects so do *NOT* mark this when you GC.
-     */
-    struct RArray at_exit;
+    rb_at_exit_list *at_exit;
 
     VALUE *defined_strings;
     st_table *frozen_strings;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/