mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Cannot call rb_thread_call_without_gvl before running VM
* dir.c (readdir_without_gvl): check the VM is already initialized before calling rb_thread_call_without_gvl(). [Bug #14108] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
1d7247e694
commit
e9614f9a37
1 changed files with 4 additions and 5 deletions
9
dir.c
9
dir.c
|
@ -743,7 +743,6 @@ to_be_skipped(const struct dirent *dp)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
#ifndef _WIN32
|
||||
static void *
|
||||
nogvl_readdir(void *ptr)
|
||||
{
|
||||
|
@ -755,11 +754,11 @@ nogvl_readdir(void *ptr)
|
|||
static struct dirent *
|
||||
readdir_without_gvl(struct dir_data *dirp)
|
||||
{
|
||||
return rb_thread_call_without_gvl(nogvl_readdir, dirp, RUBY_UBF_IO, 0);
|
||||
if (rb_cThread) /* VM is running */
|
||||
return rb_thread_call_without_gvl(nogvl_readdir, dirp, RUBY_UBF_IO, 0);
|
||||
else
|
||||
return READDIR(dirp->dir, dirp->enc);
|
||||
}
|
||||
#else
|
||||
#define readdir_without_gvl(dirp) READDIR((dirp)->dir, (dirp)->enc)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* call-seq:
|
||||
|
|
Loading…
Reference in a new issue