summaryrefslogtreecommitdiff
path: root/vm_core.h
diff options
context:
space:
mode:
authorYusuke Endoh <mame@ruby-lang.org>2020-03-06 21:32:42 +0900
committerYusuke Endoh <mame@ruby-lang.org>2020-03-06 21:41:34 +0900
commit0256e4f0f5e10f0a15cbba2cd64e252dfa864e4a (patch)
tree09f9e3f9247456d089c5d26102cbe9793938db36 /vm_core.h
parentbaaf6815704ef36160e45244b844b633ed51c3b4 (diff)
thread_pthread.c: allocate sigaltstack before pthread_create
A new (not-initialized-yet) pthread attempts to allocate sigaltstack by using xmalloc. It may cause GC, but because the thread is not initialized yet, ruby_native_thread_p() returns false, which leads to "[FATAL] failed to allocate memory" and exit. In fact, we can observe the error message in the log of OpenBSD CI: https://rubyci.org/logs/rubyci.s3.amazonaws.com/openbsd-current/ruby-master/log/20200306T083005Z.log.html.gz This changeset allocates sigaltstack before pthread is created.
Diffstat (limited to 'vm_core.h')
-rw-r--r--vm_core.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/vm_core.h b/vm_core.h
index d84e05d99b..754ce981e6 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -141,12 +141,13 @@
#if defined(SIGSEGV) && defined(HAVE_SIGALTSTACK) && defined(SA_SIGINFO) && !defined(__NetBSD__)
# define USE_SIGALTSTACK
-void *rb_register_sigaltstack(void);
-# define RB_ALTSTACK_INIT(var) var = rb_register_sigaltstack()
+void *rb_allocate_sigaltstack(void);
+void *rb_register_sigaltstack(void *);
+# define RB_ALTSTACK_INIT(var, altstack) var = rb_register_sigaltstack(altstack)
# define RB_ALTSTACK_FREE(var) xfree(var)
# define RB_ALTSTACK(var) var
#else /* noop */
-# define RB_ALTSTACK_INIT(var)
+# define RB_ALTSTACK_INIT(var, altstack)
# define RB_ALTSTACK_FREE(var)
# define RB_ALTSTACK(var) (0)
#endif
@@ -974,6 +975,10 @@ typedef struct rb_thread_struct {
/* misc */
VALUE name;
+#ifdef USE_SIGALTSTACK
+ void *altstack;
+#endif
+
} rb_thread_t;
typedef enum {