sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

Several fixes to our use of splice

Browse Source 
The splice manpage explicitly requires loff_t as offset. Copy "offset" there.
Probably not required, but I wanted to make sure it's as required.

Splice blocks with large buffers. For me it worked with 16k and blocked with
32k and beyond. It would be nice to see a clarification in the manpage of
splice for this behaviour.

Splice if used with an offset increments the offset. From the manpage this was
at least not entirely obvious :-)

I haven't yet activated this (try_splice_call ist still false by default), it
needs more testing.

Volker
This commit is contained in:
Volker Lendecke 2009-01-07 10:39:34 +00:00
parent 59f8c1d98a
commit e1459a2379
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/lib/recvfile.c
View File

@ -148,6 +148,7 @@ ssize_t sys_recvfile(int fromfd,
static int pipefd[2] = { -1, -1 }; static int pipefd[2] = { -1, -1 };
static bool try_splice_call = false; static bool try_splice_call = false;
size_t total_written = 0; size_t total_written = 0;
loff_t splice_offset = offset;
DEBUG(10,("sys_recvfile: from = %d, to = %d, " DEBUG(10,("sys_recvfile: from = %d, to = %d, "
"offset=%.0f, count = %lu\n", "offset=%.0f, count = %lu\n",
@ -180,7 +181,8 @@ ssize_t sys_recvfile(int fromfd,
while (count > 0) { while (count > 0) {
int nread, to_write; int nread, to_write;
nread = splice(fromfd, NULL, pipefd[1], NULL, count, 0); nread = splice(fromfd, NULL, pipefd[1], NULL,
MIN(count, 16384), SPLICE_F_MOVE);
if (nread == -1) { if (nread == -1) {
if (errno == EINTR) { if (errno == EINTR) {
continue; continue;
@ -197,12 +199,12 @@ ssize_t sys_recvfile(int fromfd,
to_write = nread; to_write = nread;
while (to_write > 0) { while (to_write > 0) {
int thistime; int thistime;
thistime = splice(pipefd[0], NULL, tofd, &offset, thistime = splice(pipefd[0], NULL, tofd,
to_write, 0); &splice_offset, to_write,
SPLICE_F_MOVE);
if (thistime == -1) { if (thistime == -1) {
goto done; goto done;
} }
offset += thistime;
to_write -= thistime; to_write -= thistime;
} }