--- embedaddon/lighttpd/src/network_freebsd_sendfile.c 2013/10/14 10:32:48 1.1.1.1 +++ embedaddon/lighttpd/src/network_freebsd_sendfile.c 2016/11/02 10:35:00 1.1.1.3 @@ -1,221 +1,82 @@ +#include "first.h" + #include "network_backends.h" -#ifdef USE_FREEBSD_SENDFILE +#if defined(USE_FREEBSD_SENDFILE) #include "network.h" -#include "fdevent.h" #include "log.h" -#include "stat_cache.h" #include #include -#include -#include -#include +#include -#include -#include - #include -#include -#include -#include #include -#include +int network_write_file_chunk_sendfile(server *srv, connection *con, int fd, chunkqueue *cq, off_t *p_max_bytes) { + chunk* const c = cq->first; + off_t offset, written = 0; + off_t toSend; + int r; -#ifndef UIO_MAXIOV -# if defined(__FreeBSD__) || defined(__DragonFly__) -/* FreeBSD 4.7, 4.9 defined it in sys/uio.h only if _KERNEL is specified */ -# define UIO_MAXIOV 1024 -# endif -#endif + force_assert(NULL != c); + force_assert(FILE_CHUNK == c->type); + force_assert(c->offset >= 0 && c->offset <= c->file.length); -int network_write_chunkqueue_freebsdsendfile(server *srv, connection *con, int fd, chunkqueue *cq, off_t max_bytes) { - chunk *c; + offset = c->file.start + c->offset; + toSend = c->file.length - c->offset; + if (toSend > *p_max_bytes) toSend = *p_max_bytes; - for(c = cq->first; (max_bytes > 0) && (NULL != c); c = c->next) { - int chunk_finished = 0; + if (0 == toSend) { + chunkqueue_remove_finished_chunks(cq); + return 0; + } - switch(c->type) { - case MEM_CHUNK: { - char * offset; - off_t toSend; - ssize_t r; + if (0 != network_open_file_chunk(srv, con, cq)) return -1; - size_t num_chunks, i; - struct iovec chunks[UIO_MAXIOV]; - chunk *tc; - size_t num_bytes = 0; - - /* build writev list - * - * 1. limit: num_chunks < UIO_MAXIOV - * 2. limit: num_bytes < max_bytes - */ - for(num_chunks = 0, tc = c; tc && tc->type == MEM_CHUNK && num_chunks < UIO_MAXIOV; num_chunks++, tc = tc->next); - - for(tc = c, i = 0; i < num_chunks; tc = tc->next, i++) { - if (tc->mem->used == 0) { - chunks[i].iov_base = tc->mem->ptr; - chunks[i].iov_len = 0; - } else { - offset = tc->mem->ptr + tc->offset; - toSend = tc->mem->used - 1 - tc->offset; - - chunks[i].iov_base = offset; - - /* protect the return value of writev() */ - if (toSend > max_bytes || - (off_t) num_bytes + toSend > max_bytes) { - chunks[i].iov_len = max_bytes - num_bytes; - - num_chunks = i + 1; - break; - } else { - chunks[i].iov_len = toSend; - } - - num_bytes += toSend; - } - } - - if ((r = writev(fd, chunks, num_chunks)) < 0) { - switch (errno) { - case EAGAIN: - case EINTR: - r = 0; - break; - case ENOTCONN: - case EPIPE: - case ECONNRESET: - return -2; - default: - log_error_write(srv, __FILE__, __LINE__, "ssd", - "writev failed:", strerror(errno), fd); - - return -1; - } - - r = 0; - } - - /* check which chunks have been written */ - cq->bytes_out += r; - max_bytes -= r; - - for(i = 0, tc = c; i < num_chunks; i++, tc = tc->next) { - if (r >= (ssize_t)chunks[i].iov_len) { - /* written */ - r -= chunks[i].iov_len; - tc->offset += chunks[i].iov_len; - - if (chunk_finished) { - /* skip the chunks from further touches */ - c = c->next; - } else { - /* chunks_written + c = c->next is done in the for()*/ - chunk_finished = 1; - } - } else { - /* partially written */ - - tc->offset += r; - chunk_finished = 0; - - break; - } - } - - break; - } - case FILE_CHUNK: { - off_t offset, r; - off_t toSend; - stat_cache_entry *sce = NULL; - - if (HANDLER_ERROR == stat_cache_get_entry(srv, con, c->file.name, &sce)) { - log_error_write(srv, __FILE__, __LINE__, "sb", - strerror(errno), c->file.name); - return -1; - } - - offset = c->file.start + c->offset; - toSend = c->file.length - c->offset; - if (toSend > max_bytes) toSend = max_bytes; - - if (-1 == c->file.fd) { - if (-1 == (c->file.fd = open(c->file.name->ptr, O_RDONLY))) { - log_error_write(srv, __FILE__, __LINE__, "ss", "open failed: ", strerror(errno)); - - return -1; - } - -#ifdef FD_CLOEXEC - fcntl(c->file.fd, F_SETFD, FD_CLOEXEC); -#endif - } - - r = 0; - - /* FreeBSD sendfile() */ - if (-1 == sendfile(c->file.fd, fd, offset, toSend, NULL, &r, 0)) { - switch(errno) { - case EAGAIN: - case EINTR: - /* for EAGAIN/EINTR r still contains the sent bytes */ - break; /* try again later */ - case EPIPE: - case ENOTCONN: - return -2; - default: - log_error_write(srv, __FILE__, __LINE__, "ssd", "sendfile: ", strerror(errno), errno); - return -1; - } - } else if (r == 0) { - /* We got an event to write but we wrote nothing - * - * - the file shrinked -> error - * - the remote side closed inbetween -> remote-close */ - - if (HANDLER_ERROR == stat_cache_get_entry(srv, con, c->file.name, &sce)) { - /* file is gone ? */ - return -1; - } - - if (offset >= sce->st.st_size) { - /* file shrinked, close the connection */ - return -1; - } - - return -2; - } - - c->offset += r; - cq->bytes_out += r; - max_bytes -= r; - - if (c->offset == c->file.length) { - chunk_finished = 1; - } - - break; - } + /* FreeBSD sendfile() */ + if (-1 == (r = sendfile(c->file.fd, fd, offset, toSend, NULL, &written, 0))) { + switch(errno) { + case EAGAIN: + case EINTR: + /* for EAGAIN/EINTR written still contains the sent bytes */ + break; /* try again later */ + case EPIPE: + case ENOTCONN: + return -2; + case EINVAL: + case ENOSYS: + #if defined(ENOTSUP) \ + && (!defined(EOPNOTSUPP) || EOPNOTSUPP != ENOTSUP) + case ENOTSUP: + #endif + #ifdef EOPNOTSUPP + case EOPNOTSUPP: + #endif + #ifdef ESOCKTNOSUPPORT + case ESOCKTNOSUPPORT: + #endif + #ifdef EAFNOSUPPORT + case EAFNOSUPPORT: + #endif + #ifdef USE_MMAP + return network_write_file_chunk_mmap(srv, con, fd, cq, p_max_bytes); + #else + return network_write_file_chunk_no_mmap(srv, con, fd, cq, p_max_bytes); + #endif default: - - log_error_write(srv, __FILE__, __LINE__, "ds", c, "type not known"); - + log_error_write(srv, __FILE__, __LINE__, "ssd", "sendfile: ", strerror(errno), errno); return -1; } + } - if (!chunk_finished) { - /* not finished yet */ - - break; - } + if (written >= 0) { + chunkqueue_mark_written(cq, written); + *p_max_bytes -= written; } - return 0; + return (r >= 0 && written == toSend) ? 0 : -3; } -#endif +#endif /* USE_FREEBSD_SENDFILE */