summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--thread.c10
-rw-r--r--vm_core.h1
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);