kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

altstack is native thread's attr 

Move th->altstack to th->nt->altstack.
This commit is contained in:
Koichi Sasada 2022-05-24 16:39:45 +09:00
parent 78785fb990
commit 08cee2bf80
Notes: git 2022-05-24 17:51:08 +09:00 
Merged: https://github.com/ruby/ruby/pull/5936
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
thread_pthread.c
View File

@ -1052,7 +1052,7 @@ static void *
thread_start_func_1(void *th_ptr) thread_start_func_1(void *th_ptr)
{ {
rb_thread_t *th = th_ptr; rb_thread_t *th = th_ptr;
RB_ALTSTACK_INIT(void *altstack, th->altstack); RB_ALTSTACK_INIT(void *altstack, th->nt->altstack);
#if USE_THREAD_CACHE #if USE_THREAD_CACHE
thread_start: thread_start:
#endif #endif
@ -1208,7 +1208,7 @@ native_thread_create(rb_thread_t *th)
const size_t space = space_size(stack_size); const size_t space = space_size(stack_size);
#ifdef USE_SIGALTSTACK #ifdef USE_SIGALTSTACK
th->altstack = rb_allocate_sigaltstack(); th->nt->altstack = rb_allocate_sigaltstack();
#endif #endif
th->ec->machine.stack_maxsize = stack_size - space; th->ec->machine.stack_maxsize = stack_size - space;

4
thread_pthread.h
View File

@ -50,6 +50,10 @@ struct rb_native_thread {
rb_nativethread_cond_t intr; /* th->interrupt_lock */ rb_nativethread_cond_t intr; /* th->interrupt_lock */
rb_nativethread_cond_t readyq; /* use sched->lock */ rb_nativethread_cond_t readyq; /* use sched->lock */
} cond; } cond;
#ifdef USE_SIGALTSTACK
void *altstack;
#endif
}; };
#undef except #undef except

10
vm_core.h
View File

@ -101,9 +101,6 @@ extern int ruby_assert_critical_section_entered;
#include "vm_opts.h" #include "vm_opts.h"
#include "ruby/thread_native.h" #include "ruby/thread_native.h"
#include THREAD_IMPL_H
#define RUBY_VM_THREAD_MODEL 2
/* /*
* implementation selector of get_insn_info algorithm * implementation selector of get_insn_info algorithm
@ -162,6 +159,9 @@ void *rb_register_sigaltstack(void *);
# define RB_ALTSTACK(var) (0) # define RB_ALTSTACK(var) (0)
#endif #endif
#include THREAD_IMPL_H
#define RUBY_VM_THREAD_MODEL 2
/*****************/ /*****************/
/* configuration */ /* configuration */
/*****************/ /*****************/
@ -1072,10 +1072,6 @@ typedef struct rb_thread_struct {
VALUE name; VALUE name;
struct rb_ext_config ext_config; struct rb_ext_config ext_config;
#ifdef USE_SIGALTSTACK
void *altstack;
#endif
} rb_thread_t; } rb_thread_t;
static inline unsigned int static inline unsigned int