From f4cb93adca71ac2a9b813003e8bfa2e5680ec51e Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 16 Nov 2017 08:48:59 +0000 Subject: [PATCH] make funcs static. * thread.c (rb_threadptr_trap_interrupt): make it static and remove `rb_` prefix. * thread.c (rb_threadptr_pending_interrupt_active_p): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread.c | 10 +++++----- vm_core.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/thread.c b/thread.c index ac887d037d..4242961db2 100644 --- a/thread.c +++ b/thread.c @@ -436,8 +436,8 @@ rb_threadptr_interrupt(rb_thread_t *th) rb_threadptr_interrupt_common(th, 0); } -void -rb_threadptr_trap_interrupt(rb_thread_t *th) +static void +threadptr_trap_interrupt(rb_thread_t *th) { rb_threadptr_interrupt_common(th, 1); } @@ -1715,7 +1715,7 @@ rb_threadptr_pending_interrupt_deque(rb_thread_t *th, enum handle_interrupt_timi } int -rb_threadptr_pending_interrupt_active_p(rb_thread_t *th) +threadptr_pending_interrupt_active_p(rb_thread_t *th) { /* * For optimization, we don't check async errinfo queue @@ -2063,7 +2063,7 @@ rb_threadptr_execute_interrupts(rb_thread_t *th, int blocking_timing) } /* exception from another thread */ - if (pending_interrupt && rb_threadptr_pending_interrupt_active_p(th)) { + if (pending_interrupt && threadptr_pending_interrupt_active_p(th)) { VALUE err = rb_threadptr_pending_interrupt_deque(th, blocking_timing ? INTERRUPT_ON_BLOCKING : INTERRUPT_NONE); thread_debug("rb_thread_execute_interrupts: %"PRIdVALUE"\n", err); @@ -4028,7 +4028,7 @@ rb_threadptr_check_signal(rb_thread_t *mth) /* mth must be main_thread */ if (rb_signal_buff_size() > 0) { /* wakeup main thread */ - rb_threadptr_trap_interrupt(mth); + threadptr_trap_interrupt(mth); } } diff --git a/vm_core.h b/vm_core.h index d08880fe4a..6c933afdcc 100644 --- a/vm_core.h +++ b/vm_core.h @@ -1684,7 +1684,6 @@ void rb_threadptr_interrupt(rb_thread_t *th); void rb_threadptr_unlock_all_locking_mutexes(rb_thread_t *th); void rb_threadptr_pending_interrupt_clear(rb_thread_t *th); void rb_threadptr_pending_interrupt_enque(rb_thread_t *th, VALUE v); -int rb_threadptr_pending_interrupt_active_p(rb_thread_t *th); void rb_ec_error_print(rb_execution_context_t * volatile ec, volatile VALUE errinfo); void rb_execution_context_mark(const rb_execution_context_t *ec); void rb_fiber_close(rb_fiber_t *fib);