public_git
/
whisper.cpp
mirror of https://github.com/ggml-org/whisper.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extract activate and deactivate of log_queue

This commit is contained in:
Kitaiti Makoto 2026-05-23 00:44:20 +09:00
parent cb669ef90f
commit 49e6cf2dfb
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bindings/ruby/ext/ruby_whisper_log.c
View File

@ -30,6 +30,27 @@ ruby_whisper_log_queue_initialize(ruby_whisper_log_queue *log_queue)
}
}
void
ruby_whisper_log_queue_activate(ruby_whisper_log_queue *log_queue)
{
rb_nativethread_lock_lock(&log_queue->lock);
log_queue->is_active = true;
rb_nativethread_lock_unlock(&log_queue->lock);
}
void
ruby_whisper_log_queue_deactivate(ruby_whisper_log_queue *log_queue)
{
rb_nativethread_lock_lock(&log_queue->lock);
log_queue->is_active = false;
rb_native_cond_broadcast(&log_queue->cond);
rb_nativethread_lock_unlock(&log_queue->lock);
}
static size_t
calc_enough_cap(size_t len)
{

12
bindings/ruby/ext/ruby_whisper_parakeet.c
View File

@ -5,6 +5,8 @@
extern VALUE mParakeet;
extern void ruby_whisper_log_queue_initialize(ruby_whisper_log_queue *log_queue);
extern void ruby_whisper_log_queue_activate(ruby_whisper_log_queue *log_queue);
extern void ruby_whisper_log_queue_deactivate(ruby_whisper_log_queue *log_queue);
extern void ruby_whisper_log_queue_enqueue(ruby_whisper_log_queue *log_queue, enum ggml_log_level level, const char *text);
extern VALUE ruby_whisper_log_queue_drain(ruby_whisper_log_queue *log_queue);
@ -32,7 +34,7 @@ ruby_whisper_parakeet_s_log_set(VALUE self, VALUE log_callback, VALUE user_data)
} else {
rb_iv_set(self, "@log_callback", log_callback);
rb_iv_set(self, "@log_callback_user_data", user_data);
parakeet_log_queue.is_active = true;
ruby_whisper_log_queue_activate(&parakeet_log_queue);
rb_funcall(mParakeet, id_start_log_callback_thread, 0);
parakeet_log_set(ruby_whisper_parakeet_log_callback, NULL);
}
@ -47,13 +49,7 @@ ruby_whisper_parakeet_end_proc(VALUE args)
ID id_alive = rb_intern("alive?");
ID id_join = rb_intern("join");
rb_nativethread_lock_lock(&parakeet_log_queue.lock);
parakeet_log_queue.is_active = false;
rb_native_cond_broadcast(&parakeet_log_queue.cond);
rb_nativethread_lock_unlock(&parakeet_log_queue.lock);
ruby_whisper_log_queue_deactivate(&parakeet_log_queue);
VALUE log_callback_thread = rb_ivar_get(mParakeet, id_log_callback_thread);
if (!NIL_P(log_callback_thread) && RTEST(rb_funcall(log_callback_thread, id_alive, 0))) {
rb_funcall(log_callback_thread, id_join, 0);