From 7fbaa0bedf29d6c44a3e038ec6dd9d153e4c7479 Mon Sep 17 00:00:00 2001 From: kosaki Date: Sat, 15 Dec 2012 05:40:29 +0000 Subject: * io.c (finish_writeconv): uses rb_write_internal2 if fptr->write_lock have. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ io.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 21e6f439d6..bdc96a30e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 15 14:18:44 2012 KOSAKI Motohiro + + * io.c (finish_writeconv): uses rb_write_internal2 if + fptr->write_lock have. + Sat Dec 15 13:57:08 2012 KOSAKI Motohiro * thread.c (rb_mutex_owned_p): remove static. diff --git a/io.c b/io.c index 9103664412..bfafe636d8 100644 --- a/io.c +++ b/io.c @@ -3858,7 +3858,10 @@ finish_writeconv(rb_io_t *fptr, int noalloc) res = rb_econv_convert(fptr->writeconv, NULL, NULL, &dp, de, 0); while (dp-ds) { retry: - r = rb_write_internal(fptr->fd, ds, dp-ds); + if (fptr->write_lock && rb_mutex_owned_p(fptr->write_lock)) + r = rb_write_internal2(fptr->fd, ds, dp-ds); + else + r = rb_write_internal(fptr->fd, ds, dp-ds); if (r == dp-ds) break; if (0 <= r) { -- cgit v1.2.3