diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-15 05:18:37 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-15 05:18:37 +0000 |
commit | e9614f9a37cee98a2addcffed1ae5111f97ad5d9 (patch) | |
tree | a8a441f77f165eb7203c61816506aec576057beb | |
parent | 1d7247e6941ed1630ad172834bbaaf25b968be02 (diff) | |
download | ruby-e9614f9a37cee98a2addcffed1ae5111f97ad5d9.tar.gz |
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
-rw-r--r-- | dir.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -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: |