* io.c (rb_io_close): close(2) on a fd which is being read by

another thread causes deadlock on Mac OS X 10.5

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-07-08 23:37:08 +00:00
Родитель e33183acca
Коммит dc3697f62f
2 изменённых файлов: 11 добавлений и 0 удалений

Просмотреть файл

@ -1,3 +1,8 @@
Sat Jul 9 08:37:05 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_close): close(2) on a fd which is being read by
another thread causes deadlock on Mac OS X 10.5
Fri Jul 8 21:20:39 2011 NARUSE, Yui <naruse@ruby-lang.org>
* addr2line.c: use USE_ELF instead of __ELF__ because Solaris

6
io.c
Просмотреть файл

@ -3621,6 +3621,12 @@ rb_io_close(VALUE io)
if (fptr->fd < 0) return Qnil;
fd = fptr->fd;
#if defined __APPLE__ && defined(__MACH__) && \
(!defined(MAC_OS_X_VERSION_MIN_ALLOWED) || MAC_OS_X_VERSION_MIN_ALLOWED <= 1050)
/* close(2) on a fd which is being read by another thread causes
* deadlock on Mac OS X 10.5 */
rb_thread_fd_close(fd);
#endif
rb_io_fptr_cleanup(fptr, FALSE);
rb_thread_fd_close(fd);