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
static int pipefd[2] = { -1, -1 };
static bool try_splice_call = false;
size_t total_written = 0;
static int pipefd[2] = { -1, -1 };
static bool try_splice_call = false;
size_t total_written = 0;
+ loff_t splice_offset = offset;
DEBUG(10,("sys_recvfile: from = %d, to = %d, "
"offset=%.0f, count = %lu\n",
DEBUG(10,("sys_recvfile: from = %d, to = %d, "
"offset=%.0f, count = %lu\n",
while (count > 0) {
int nread, to_write;
while (count > 0) {
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 (errno == EINTR) {
continue;
if (nread == -1) {
if (errno == EINTR) {
continue;
to_write = nread;
while (to_write > 0) {
int thistime;
to_write = nread;
while (to_write > 0) {
int thistime;
- thistime = splice(pipefd[0], NULL, tofd, &offset,
- to_write, 0);
+ thistime = splice(pipefd[0], NULL, tofd,
+ &splice_offset, to_write,
+ SPLICE_F_MOVE);
if (thistime == -1) {
goto done;
}
if (thistime == -1) {
goto done;
}