Feature #13575 ยป 0001-speed-up-IO-close-with-many-threads.patch
| thread.c | ||
|---|---|---|
|
#define eTerminateSignal INT2FIX(1)
|
||
|
static volatile int system_working = 1;
|
||
|
struct waiting_fd {
|
||
|
struct list_node wfd_node; /* <=> vm.waiting_fds */
|
||
|
rb_thread_t *th;
|
||
|
int fd;
|
||
|
};
|
||
|
inline static void
|
||
|
st_delete_wrap(st_table *table, st_data_t key)
|
||
|
{
|
||
| ... | ... | |
|
rb_thread_t *th = GET_THREAD();
|
||
|
int saved_errno = 0;
|
||
|
th->waiting_fd = -1;
|
||
|
if (ubf == RUBY_UBF_IO || ubf == RUBY_UBF_PROCESS) {
|
||
|
ubf = ubf_select;
|
||
|
data2 = th;
|
||
| ... | ... | |
|
rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd)
|
||
|
{
|
||
|
volatile VALUE val = Qundef; /* shouldn't be used */
|
||
|
rb_vm_t *vm = GET_VM();
|
||
|
rb_thread_t *th = GET_THREAD();
|
||
|
volatile int saved_errno = 0;
|
||
|
int state;
|
||
|
struct waiting_fd wfd;
|
||
|
th->waiting_fd = fd;
|
||
|
wfd.fd = fd;
|
||
|
wfd.th = th;
|
||
|
list_add(&vm->waiting_fds, &wfd.wfd_node);
|
||
|
TH_PUSH_TAG(th);
|
||
|
if ((state = EXEC_TAG()) == 0) {
|
||
| ... | ... | |
|
val = func(data1);
|
||
|
saved_errno = errno;
|
||
|
}, ubf_select, th, FALSE);
|
||
|
}
|
||
|
TH_POP_TAG();
|
||
|
/* clear waiting_fd anytime */
|
||
|
th->waiting_fd = -1;
|
||
|
/* must be deleted before jump */
|
||
|
list_del(&wfd.wfd_node);
|
||
|
if (state) {
|
||
|
TH_JUMP_TAG(th, state);
|
||
| ... | ... | |
|
rb_notify_fd_close(int fd)
|
||
|
{
|
||
|
rb_vm_t *vm = GET_THREAD()->vm;
|
||
|
rb_thread_t *th = 0;
|
||
|
struct waiting_fd *wfd = 0;
|
||
|
int busy;
|
||
|
busy = 0;
|
||
|
list_for_each(&vm->living_threads, th, vmlt_node) {
|
||
|
if (th->waiting_fd == fd) {
|
||
|
list_for_each(&vm->waiting_fds, wfd, wfd_node) {
|
||
|
if (wfd->fd == fd) {
|
||
|
rb_thread_t *th = wfd->th;
|
||
|
VALUE err = th->vm->special_exceptions[ruby_error_stream_closed];
|
||
|
rb_threadptr_pending_interrupt_enque(th, err);
|
||
|
rb_threadptr_interrupt(th);
|
||
| vm.c | ||
|---|---|---|
|
th->status = THREAD_RUNNABLE;
|
||
|
th->errinfo = Qnil;
|
||
|
th->last_status = Qnil;
|
||
|
th->waiting_fd = -1;
|
||
|
th->root_svar = Qfalse;
|
||
|
th->local_storage_recursive_hash = Qnil;
|
||
|
th->local_storage_recursive_hash_for_trace = Qnil;
|
||
| vm_core.h | ||
|---|---|---|
|
struct rb_thread_struct *main_thread;
|
||
|
struct rb_thread_struct *running_thread;
|
||
|
struct list_head waiting_fds; /* <=> struct waiting_fd */
|
||
|
struct list_head living_threads;
|
||
|
size_t living_thread_num;
|
||
|
VALUE thgroup_default;
|
||
| ... | ... | |
|
/* passing state */
|
||
|
int state;
|
||
|
int waiting_fd;
|
||
|
/* for rb_iterate */
|
||
|
VALUE passed_block_handler;
|
||
| ... | ... | |
|
static inline void
|
||
|
rb_vm_living_threads_init(rb_vm_t *vm)
|
||
|
{
|
||
|
list_head_init(&vm->waiting_fds);
|
||
|
list_head_init(&vm->living_threads);
|
||
|
vm->living_thread_num = 0;
|
||
|
}
|
||
|
-
|
||