1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

define rb_current_ec_set in all cases

Browse Source
This commit is contained in:
Matt Valentine-House 2024-11-23 09:28:17 +00:00
parent 551be8219e
commit f127bcb829
Notes: git 2024-11-25 13:05:40 +00:00 
Merged: https://github.com/ruby/ruby/pull/12149
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gc.c
View File

@ -200,11 +200,7 @@ rb_gc_worker_thread_set_vm_context(struct rb_gc_vm_context *context)
GC_ASSERT(rb_current_execution_context(false) == NULL); GC_ASSERT(rb_current_execution_context(false) == NULL);
#ifdef RB_THREAD_LOCAL_SPECIFIER #ifdef RB_THREAD_LOCAL_SPECIFIER
# ifdef __APPLE__
rb_current_ec_set(context->ec); rb_current_ec_set(context->ec);
# else
ruby_current_ec = context->ec;
# endif
#else #else
native_tls_set(ruby_current_ec_key, context->ec); native_tls_set(ruby_current_ec_key, context->ec);
#endif #endif
@ -218,11 +214,7 @@ rb_gc_worker_thread_unset_vm_context(struct rb_gc_vm_context *context)
GC_ASSERT(rb_current_execution_context(true) == context->ec); GC_ASSERT(rb_current_execution_context(true) == context->ec);
#ifdef RB_THREAD_LOCAL_SPECIFIER #ifdef RB_THREAD_LOCAL_SPECIFIER
# ifdef __APPLE__
rb_current_ec_set(NULL); rb_current_ec_set(NULL);
# else
ruby_current_ec = NULL;
# endif
#else #else
native_tls_set(ruby_current_ec_key, NULL); native_tls_set(ruby_current_ec_key, NULL);
#endif #endif

9
ractor_core.h
View File

@ -306,18 +306,15 @@ rb_ractor_thread_switch(rb_ractor_t *cr, rb_thread_t *th)
} }
#define rb_ractor_set_current_ec(cr, ec) rb_ractor_set_current_ec_(cr, ec, __FILE__, __LINE__) #define rb_ractor_set_current_ec(cr, ec) rb_ractor_set_current_ec_(cr, ec, __FILE__, __LINE__)
#ifdef RB_THREAD_LOCAL_SPECIFIER
void rb_current_ec_set(rb_execution_context_t *ec);
#endif
static inline void static inline void
rb_ractor_set_current_ec_(rb_ractor_t *cr, rb_execution_context_t *ec, const char *file, int line) rb_ractor_set_current_ec_(rb_ractor_t *cr, rb_execution_context_t *ec, const char *file, int line)
{ {
#ifdef RB_THREAD_LOCAL_SPECIFIER #ifdef RB_THREAD_LOCAL_SPECIFIER
# ifdef __APPLE__
rb_current_ec_set(ec); rb_current_ec_set(ec);
# else
ruby_current_ec = ec;
# endif
#else #else
native_tls_set(ruby_current_ec_key, ec); native_tls_set(ruby_current_ec_key, ec);
#endif #endif