sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

Try to fix recvfile using splice on Linux

Browse Source 
According to the splice(2) manpage, one of the file descriptors *must* be a
pipe. With this patch I could successfully run splice(2) on a debian lenny
installation.

Jeremy, please check!
This commit is contained in:
Volker Lendecke 2008-12-23 22:45:03 +01:00
parent 9e1cabdd43
commit e0fd61f0cb
1 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
source3/lib/recvfile.c
View File

@ -145,6 +145,7 @@ ssize_t sys_recvfile(int fromfd,
SMB_OFF_T offset,
size_t count)
{
static int pipefd[2] = { -1, -1 };
static bool try_splice_call = true;
size_t total_written = 0;
@ -171,31 +172,45 @@ ssize_t sys_recvfile(int fromfd,
count);
}
while (total_written < count) {
ssize_t ret = splice(fromfd,
NULL,
tofd,
&offset,
count,
0);
if (ret == -1) {
if (errno != EINTR) {
if (total_written == 0 &&
(errno == EBADF || errno == EINVAL)) {
try_splice_call = false;
return default_sys_recvfile(fromfd,
tofd,
offset,
count);
}
break;
}
continue;
}
total_written += ret;
count -= ret;
if ((pipefd[0] == -1) && (pipe(pipefd) == -1)) {
try_splice_call = false;
return default_sys_recvfile(fromfd, tofd, offset, count);
}
while (count > 0) {
int nread, to_write;
nread = splice(fromfd, NULL, pipefd[1], NULL, count, 0);
if (nread == -1) {
if (errno == EINTR) {
continue;
}
if (total_written == 0 &&
(errno == EBADF || errno == EINVAL)) {
try_splice_call = false;
return default_sys_recvfile(fromfd, tofd,
offset, count);
}
break;
}
to_write = nread;
while (to_write > 0) {
int thistime;
thistime = splice(pipefd[0], NULL, tofd, &offset,
to_write, 0);
if (thistime == -1) {
goto done;
}
offset += thistime;
to_write -= thistime;
}
total_written += nread;
count -= nread;
}
done:
if (total_written < count) {
int saved_errno = errno;
if (drain_socket(fromfd, count-total_written) !=