1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* io.c (simple_sendfile): disable the use of sendfile(2) on

Browse Source 
FreeBSD. It blocks on TestIO#test_copy_stream_socket.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-12-13 12:28:09 +00:00
parent 7d481b5423
commit 903538cbb3
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Dec 13 21:26:33 2010 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (simple_sendfile): disable the use of sendfile(2) on
FreeBSD. It blocks on TestIO#test_copy_stream_socket.
Mon Dec 13 18:35:33 2010 NARUSE, Yui <naruse@ruby-lang.org> Mon Dec 13 18:35:33 2010 NARUSE, Yui <naruse@ruby-lang.org>
* io.c: define USE_SENDFILE on FreeBSD or DragonFly BSD. * io.c: define USE_SENDFILE on FreeBSD or DragonFly BSD.

9
io.c
View File

@ -8216,7 +8216,8 @@ simple_sendfile(int out_fd, int in_fd, off_t *offset, off_t count)
return sendfile(out_fd, in_fd, offset, (size_t)count); return sendfile(out_fd, in_fd, offset, (size_t)count);
} }
# elif defined(__FreeBSD__) || defined(__DragonFly__) # elif 0 /* defined(__FreeBSD__) || defined(__DragonFly__) */
/* at least FreeBSD 8.1 + r30193, sendfiles blocks its execution... */
# define USE_SENDFILE # define USE_SENDFILE
# ifdef HAVE_SYS_UIO_H # ifdef HAVE_SYS_UIO_H
@ -8227,14 +8228,16 @@ static ssize_t
simple_sendfile(int out_fd, int in_fd, off_t *offset, off_t count) simple_sendfile(int out_fd, int in_fd, off_t *offset, off_t count)
{ {
int r; int r;
size_t sbytes; off_t sbytes;
struct sf_hdtr hdtr = {NULL, 0, NULL, 0};
# if SIZEOF_OFF_T > SIZEOF_SIZE_T # if SIZEOF_OFF_T > SIZEOF_SIZE_T
/* we are limited by the 32-bit ssize_t return value on 32-bit */ /* we are limited by the 32-bit ssize_t return value on 32-bit */
if (count > (off_t)SSIZE_MAX) if (count > (off_t)SSIZE_MAX)
count = SSIZE_MAX; count = SSIZE_MAX;
# endif # endif
r = sendfile(in_fd, out_fd, *offset, (size_t)count, NULL, &sbytes, 0); r = sendfile(in_fd, out_fd, offset ? *offset : 0, (size_t)count, &hdtr, &sbytes, SF_NODISKIO);
if (r != 0) return -1; if (r != 0) return -1;
if (offset) *offset = sbytes;
return (ssize_t)sbytes; return (ssize_t)sbytes;
} }