diff options
| author | Koichi Sasada <[email protected]> | 2023-03-31 03:52:58 +0900 |
|---|---|---|
| committer | Koichi Sasada <[email protected]> | 2023-03-31 11:28:18 +0900 |
| commit | 2093e4c2db1e19991e601bf5191eddb4652de35d () | |
| tree | 486cb12704655596fdec0227a37450da23d8b5f4 | |
| parent | 83667008b925c32b3ab70fb6ec70f7398e960d1e (diff) | |
`nt->serial` for `RUBY_DEBUG_LOG`
Show native thread's serial on `RUBY_DEBUG_LOG`. `nt->serial` is also stored into `ruby_nt_serial` if the compiler supports `RB_THREAD_LOCAL_SPECIFIER`.
Notes: Merged: https://.com/ruby/ruby/pull/7630
| -rw-r--r-- | debug.c | 40 | ||||
| -rw-r--r-- | thread_pthread.c | 18 | ||||
| -rw-r--r-- | thread_pthread.h | 20 | ||||
| -rw-r--r-- | vm.c | 3 |
4 files changed, 65 insertions, 16 deletions
@@ -533,7 +533,9 @@ ruby_debug_log(const char *file, int line, const char *func_name, const char *fm len += r; } - if (rb_current_execution_context(false)) { // Ruby location int ruby_line; const char *ruby_file = rb_source_location_cstr(&ruby_line); @@ -547,22 +549,46 @@ ruby_debug_log(const char *file, int line, const char *func_name, const char *fm if (r < 0) rb_bug("ruby_debug_log returns %d\n", r); len += r; } // ractor information if (ruby_single_main_ractor == NULL) { - rb_ractor_t *cr = GET_RACTOR(); if (r && len < MAX_DEBUG_LOG_MESSAGE_LEN) { - r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\tr:#%u/%u", - (unsigned int)rb_ractor_id(cr), GET_VM()->ractor.cnt); if (r < 0) rb_bug("ruby_debug_log returns %d\n", r); len += r; } } // thread information - const rb_thread_t *th = GET_THREAD(); - if (r && len < MAX_DEBUG_LOG_MESSAGE_LEN) { - r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\tth:%u", rb_th_serial(th)); if (r < 0) rb_bug("ruby_debug_log returns %d\n", r); len += r; } @@ -1157,6 +1157,11 @@ static void * thread_start_func_1(void *th_ptr) { rb_thread_t *th = th_ptr; RB_ALTSTACK_INIT(void *altstack, th->nt->altstack); #if USE_THREAD_CACHE thread_start: @@ -1298,13 +1303,24 @@ clear_thread_cache_altstack(void) } #endif static int native_thread_create(rb_thread_t *th) { int err = 0; VM_ASSERT(th->nt == 0); - th->nt = ZALLOC(struct rb_native_thread); if (use_cached_thread(th)) { RUBY_DEBUG_LOG("use cached nt. th:%u", rb_th_serial(th)); @@ -26,7 +26,7 @@ struct rb_thread_sched_item { }; struct rb_native_thread { - int id; rb_nativethread_id_t thread_id; @@ -101,13 +101,17 @@ struct rb_thread_sched { RUBY_SYMBOL_EXPORT_BEGIN #ifdef RB_THREAD_LOCAL_SPECIFIER -# ifdef __APPLE__ -// on Darwin, TLS can not be accessed across .so -struct rb_execution_context_struct *rb_current_ec(void); -void rb_current_ec_set(struct rb_execution_context_struct *); -# else -RUBY_EXTERN RB_THREAD_LOCAL_SPECIFIER struct rb_execution_context_struct *ruby_current_ec; -# endif #else typedef pthread_key_t native_tls_key_t; @@ -440,6 +440,9 @@ bool ruby_vm_keep_script_lines; #ifdef RB_THREAD_LOCAL_SPECIFIER RB_THREAD_LOCAL_SPECIFIER rb_execution_context_t *ruby_current_ec; #ifdef __APPLE__ rb_execution_context_t * |