Mercurial > vim

diff src/if_ruby.c @ 4369:c9820396afb9 v7.3.933

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.933 Problem: Ruby on Mac crashes due to GC failure. Solution: Init the stack from main(). (Hiroshi Shirosaki)
author Bram Moolenaar <bram@vim.org>
date Sat, 11 May 2013 13:56:18 +0200
parents 04736b4030ec
children c42e130ebf36
line wrap: on
line diff
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -144,6 +144,7 @@
 #endif
 
 static int ruby_initialized = 0;
+static void *ruby_stack_start;
 static VALUE objtbl;
 
 static VALUE mVIM;
@@ -226,6 +227,7 @@ static void ruby_vim_init(void);
 # define rb_float_new			dll_rb_float_new
 # define rb_ary_new			dll_rb_ary_new
 # define rb_ary_push			dll_rb_ary_push
+# define ruby_init_stack		dll_ruby_init_stack
 #else
 # define rb_str2cstr			dll_rb_str2cstr
 #endif
@@ -250,7 +252,6 @@ static void ruby_vim_init(void);
 # define rb_enc_str_new			dll_rb_enc_str_new
 # define rb_sprintf			dll_rb_sprintf
 # define rb_require			dll_rb_require
-# define ruby_init_stack		dll_ruby_init_stack
 # define ruby_process_options		dll_ruby_process_options
 #endif
 
@@ -335,6 +336,7 @@ static char * (*dll_rb_string_value_ptr)
 static VALUE (*dll_rb_float_new) (double);
 static VALUE (*dll_rb_ary_new) (void);
 static VALUE (*dll_rb_ary_push) (VALUE, VALUE);
+static void (*ruby_init_stack)(VALUE*);
 #endif
 #ifdef RUBY19_OR_LATER
 static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
@@ -347,7 +349,6 @@ static rb_encoding* (*dll_rb_enc_find) (
 static VALUE (*dll_rb_enc_str_new) (const char*, long, rb_encoding*);
 static VALUE (*dll_rb_sprintf) (const char*, ...);
 static VALUE (*dll_rb_require) (const char*);
-static void (*ruby_init_stack)(VALUE*);
 static void* (*ruby_process_options)(int, char**);
 #endif
 
@@ -475,6 +476,7 @@ static struct
 #endif
 #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
     {"rb_string_value_ptr", (RUBY_PROC*)&dll_rb_string_value_ptr},
+    {"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
 # if DYNAMIC_RUBY_VER <= 19
     {"rb_float_new", (RUBY_PROC*)&dll_rb_float_new},
 # else
@@ -491,7 +493,6 @@ static struct
     {"rb_enc_str_new", (RUBY_PROC*)&dll_rb_enc_str_new},
     {"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf},
     {"rb_require", (RUBY_PROC*)&dll_rb_require},
-    {"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
     {"ruby_process_options", (RUBY_PROC*)&dll_ruby_process_options},
 #endif
     {"", NULL},
@@ -716,8 +717,8 @@ static int ensure_ruby_initialized(void)
 	    NtInitialize(&argc, &argv);
 #endif
 	    {
-#ifdef RUBY19_OR_LATER
-		RUBY_INIT_STACK;
+#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+		ruby_init_stack(ruby_stack_start);
 #endif
 		ruby_init();
 	    }
@@ -1389,3 +1390,9 @@ static void ruby_vim_init(void)
     rb_define_virtual_variable("$curbuf", buffer_s_current, 0);
     rb_define_virtual_variable("$curwin", window_s_current, 0);
 }
+
+void vim_ruby_init(void *stack_start)
+{
+    /* should get machine stack start address early in main function */
+    ruby_stack_start = stack_start;
+}