1 files changed, 0 insertions, 467 deletions

diff --git a/src/network_posix_aio.c b/src/network_posix_aio.c
deleted file mode 100644
index b77abb22..00000000
--- a/src/network_posix_aio.c
+++ /dev/null
@@ -1,467 +0,0 @@
-/*
- * make sure _GNU_SOURCE is defined
- */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE /* we need O_DIRECT */
-#endif
-
-#include "network_backends.h"
-
-#ifdef USE_POSIX_AIO
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <string.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <assert.h>
-
-#include <aio.h>
-
-#include "network.h"
-#include "fdevent.h"
-#include "log.h"
-#include "stat_cache.h"
-#include "joblist.h"
-
-#include "sys-files.h"
-#include "status_counter.h"
-
-typedef struct {
-	server *srv;
-	connection *con;
-
-	struct aiocb *iocb;
-
-	chunk *c;
-} write_job;
-
-static write_job *write_job_init() {
-	write_job *wj = calloc(1, sizeof(*wj));
-
-	return wj;
-}
-
-static void write_job_free(write_job *wj) {
-	if (!wj) return;
-
-	free(wj);
-}
-
-#if (defined(__FreeBSD__) || defined(__DragonFly__))
-/* someone is wrong here, both (MacOS X and FreeBSD) reference POSIX 1003.1b but have
- * different names (in /usr/include/sys/signal.h) */
-#define sival_ptr sigval_ptr
-#endif
-
-/**
- * handle the completion of a AIO-read() operation
- *
- * Linux has 'union sigval' and 'sigval_t'
- * MacOS X and FreeBSD only 'union sigval'
- * */
-static void posix_aio_completion_handler(union sigval foo) {
-	write_job *wj = (write_job *)foo.sival_ptr;
-	server *srv        = wj->srv;
-	connection *con    = wj->con;
-	struct aiocb *iocb = wj->iocb;
-	chunk *c           = wj->c;
-	int res;
-
-	if (srv->is_shutdown) {
-		write_job_free(wj);
-	
-		return;
-	}
-
-	res = aio_error(iocb);
-
-	if (res != EINPROGRESS) {
-		switch (res) {
-		case ECANCELED:
-			TRACE("aio-op was canceled, was asked for %s (fd = %d)",
-				SAFE_BUF_STR(con->uri.path), con->sock->fd);
-			c->async.ret_val = NETWORK_STATUS_FATAL_ERROR;
-			break;
-		case 0:
-			break;
-		default:
-			TRACE("aio-op failed with %d (%s), was asked for %s (fd = %d)",
-				res, strerror(res), SAFE_BUF_STR(con->uri.path), con->sock->fd);
-			c->async.ret_val = NETWORK_STATUS_FATAL_ERROR;
-			break;
-		}
-
-		if ((res = aio_return(iocb)) < 0) {
-			/* we have an error */
-
-			TRACE("aio-return returned %d (%s), was asked for %s (fd = %d)",
-				res, strerror(res), SAFE_BUF_STR(con->uri.path), con->sock->fd);
-
-			c->async.ret_val = NETWORK_STATUS_FATAL_ERROR;
-		}
-
-		joblist_async_append(srv, con);
-
-		iocb->aio_nbytes = 0; /* mark the entry as unused */
-	}
-
-	write_job_free(wj);
-}
-
-NETWORK_BACKEND_WRITE(posixaio) {
-	chunk *c, *tc;
-
-	for(c = cq->first; c; c = c->next) {
-		int chunk_finished = 0;
-		network_status_t ret;
-
-		switch(c->type) {
-		case MEM_CHUNK:
-			ret = network_write_chunkqueue_writev_mem(srv, con, sock, cq, c);
-
-			/* check which chunks are finished now */
-			for (tc = c; tc && chunk_is_done(tc); tc = tc->next) {
-				/* skip the first c->next as that will be done by the c = c->next in the other for()-loop */
-				if (chunk_finished) {
-					c = c->next;
-				} else {
-					chunk_finished = 1;
-				}
-			}
-
-			if (ret != NETWORK_STATUS_SUCCESS) {
-				return ret;
-			}
-
-			break;
-		case FILE_CHUNK: {
-			ssize_t r;
-			int rounds = 8;
-
-			/* open file if not already opened */
-			if (-1 == c->file.fd) {
-				if (-1 == (c->file.fd = open(c->file.name->ptr, O_RDONLY | /* O_DIRECT | */ (srv->srvconf.use_noatime ? O_NOATIME : 0)))) {
-					if (errno == EMFILE) return NETWORK_STATUS_WAIT_FOR_FD;
-
-					ERROR("opening '%s' failed: %s", SAFE_BUF_STR(c->file.name), strerror(errno));
-
-					return NETWORK_STATUS_FATAL_ERROR;
-				}
-#ifdef FD_CLOEXEC
-				fcntl(c->file.fd, F_SETFD, FD_CLOEXEC);
-#endif
-			}
-
-			do {
-				size_t toSend;
-				const off_t max_toSend = 4 * 256 * 1024; /** should be larger than the send buffer */
-				off_t offset;
-
-				offset = c->file.start + c->offset;
-
-				toSend = c->file.length - c->offset > max_toSend ?
-					max_toSend : c->file.length - c->offset;
-
-				if (0 == c->file.copy.length) {
-					int async_error = 0;
-
-					size_t iocb_ndx;
-
-					c->file.copy.offset = 0;
-					c->file.copy.length = 0;
-
-					/* if we reused the previous tmp-file we get overlaps
-					 *
-					 *    1 ... 3904 are ok
-					 * 3905 ... 4096 are replaces by 8001 ... 8192
-					 *
-					 * somehow the second read writes into the mmap() before
-					 * the sendfile is finished which is very strange.
-					 *
-					 * if someone finds the reason for this, feel free to remove
-					 * this if again and number of reduce the syscalls a bit.
-					 */
-					if (c->file.mmap.start) {
-						munmap(c->file.mmap.start, c->file.mmap.length);
-						c->file.mmap.start = MAP_FAILED;
-					}
-
-					if (-1 != c->file.copy.fd) {
-						close(c->file.copy.fd);
-						c->file.copy.fd = -1;
-					}
-
-					/* do we have a IOCB we can use ? */
-
-					for (iocb_ndx = 0; async_error == 0 && iocb_ndx < srv->srvconf.max_read_threads; iocb_ndx++) {
-						if (0 == srv->posix_aio_iocbs[iocb_ndx].aio_nbytes) {
-							break;
-						}
-					}
-
-					if (iocb_ndx == srv->srvconf.max_read_threads) {
-						async_error = 1;
-					}
-
-
-					/* get mmap()ed mem-block in /dev/shm
-					 *
-					 * in case we don't have a iocb available, we still need the mmap() for the blocking
-					 * read()
-					 *  */
-#if defined(HAVE_MEM_MMAP_ZERO)
-					if (-1 == c->file.copy.fd ) {
-						int mmap_fd = -1;
-
-						/* open a file in /dev/shm to write to */
-						if (-1 == (mmap_fd = open("/dev/zero", O_RDWR))) {
-							async_error = 1;
-
-							if (errno != EMFILE) {
-								TRACE("open(/dev/zero) returned: %d (%s), falling back to sync-io",
-									errno, strerror(errno));
-							} else {
-								return NETWORK_STATUS_WAIT_FOR_FD;
-							}
-						} else {
-							c->file.mmap.offset = 0;
-							c->file.mmap.length = toSend;
-
-							c->file.mmap.start = mmap(0, c->file.mmap.length,
-									PROT_READ | PROT_WRITE, MAP_SHARED, mmap_fd, 0);
-							if (c->file.mmap.start == MAP_FAILED) {
-								async_error = 1;
-							} else {
-								c->file.copy.length = toSend;
-							}
-
-							close(mmap_fd);
-							mmap_fd = -1;
-						
-						}
-					}
-#elif defined(HAVE_MEM_MMAP_ANON)
-					c->file.mmap.offset = 0;
-					c->file.mmap.length = c->file.copy.length; /* align to page-size */
-					c->file.mmap.start = mmap(0, c->file.mmap.length,
-						PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-							
-					if (c->file.mmap.start == MAP_FAILED) {
-						async_error = 1;
-					}
-#else
-#error hmm, does your system support mmap(/dev/zero) or mmap(MAP_ANON)
-#endif
-
-					/* looks like we couldn't get a temp-file [disk-full]
-					 *
-					 * if we only have 4k to send we can fall back to sync-read as either the read-ahead
-					 * or the stat() has put the data into the fs-buffers
-					 *
-					 * the 4kbyte are guessed ... someone should benchmark it.
-					 *
-					 *  */
-					if (async_error == 0 && c->file.mmap.start != MAP_FAILED && c->file.length > 4 * 1024) {
-						struct aiocb *iocb = NULL;
-						write_job *wj;
-
-						assert(c->file.copy.length > 0);
-
-						iocb = &srv->posix_aio_iocbs[iocb_ndx];
-
-						memset(iocb, 0, sizeof(*iocb));
-
-						iocb->aio_fildes = c->file.fd;
-						iocb->aio_buf    = c->file.mmap.start;
-						iocb->aio_nbytes = c->file.copy.length;
-						iocb->aio_offset = c->file.start + c->offset;
-
-						wj = write_job_init();
-						wj->srv = srv;
-						wj->con = con;
-						wj->iocb = iocb;
-
-						iocb->aio_sigevent.sigev_notify_function = posix_aio_completion_handler;
-						iocb->aio_sigevent.sigev_notify_attributes = NULL;
-						iocb->aio_sigevent.sigev_value.sival_ptr = wj;
-						iocb->aio_sigevent.sigev_notify = SIGEV_THREAD;
-
-					       	if (0 == aio_read(iocb)) {
-							status_counter_inc(CONST_STR_LEN("server.io.posix-aio.async-read"));
-							return NETWORK_STATUS_WAIT_FOR_AIO_EVENT;
-						} else {
-							if (errno != EAGAIN) {
-								TRACE("aio_read returned: %d (%s), falling back to sync-io",
-									errno, strerror(errno));
-							} else {
-								TRACE("aio_read returned EAGAIN on (%d - %d), -> sync-io", c->file.fd, c->file.copy.fd);
-							}
-						}
-					}
-
-					/* fall back to a blocking read */
-
-					if (c->file.mmap.start != MAP_FAILED) {
-						status_counter_inc(CONST_STR_LEN("server.io.posix-aio.sync-read"));
-
-						assert(c->file.copy.length > 0);
-
-						lseek(c->file.fd, c->file.start + c->offset, SEEK_SET);
-
-						if (-1 == (r = read(c->file.fd, c->file.mmap.start, c->file.copy.length))) {
-							switch(errno) {
-							default:
-								ERROR("reading file failed: %d (%s)", errno, strerror(errno));
-
-								return NETWORK_STATUS_FATAL_ERROR;
-							}
-						}
-
-						if (r == 0) {
-							ERROR("read() returned 0 ... not good: %s", "");
-
-							return NETWORK_STATUS_FATAL_ERROR;
-						}
-
-						if (r != c->file.copy.length) {
-							ERROR("read() returned %zd instead of %jd", r, (intmax_t) c->file.copy.length);
-
-							return NETWORK_STATUS_FATAL_ERROR;
-						}
-					} else {
-						ERROR("the mmap() failed, no way for a fallback: %s", "");
-
-						return NETWORK_STATUS_FATAL_ERROR;
-					}
-
-				} else if (c->file.copy.offset == 0) {
-#if 0
-					/**
-					 * aio_write only creates extra-trouble
-					 *
-					 * instead we use the classic non-blocking-io write() call on the socket
-					 */
-					size_t iocb_ndx;
-					struct aiocb *iocb = NULL;
-
-					/* the aio_read() is finished, send it */
-
-					/* do we have a IOCB we can use ? */
-
-					for (iocb_ndx = 0; iocb_ndx < POSIX_AIO_MAX_IOCBS; iocb_ndx++) {
-						if (NULL == srv->posix_aio_data[iocb_ndx]) {
-							break;
-						}
-					}
-
-					assert(iocb_ndx != POSIX_AIO_MAX_IOCBS);
-
-					iocb = &srv->posix_aio_iocbs[iocb_ndx];
-					memset(iocb, 0, sizeof(*iocb));
-
-					iocb->aio_fildes = sock->fd;
-					iocb->aio_buf = c->file.mmap.start;
-					iocb->aio_nbytes = c->file.copy.length;
-					iocb->aio_offset = 0;
-
-					/* the write should only return when it is finished */
-					fcntl(sock->fd, F_SETFL, fcntl(sock->fd, F_GETFL) & ~O_NONBLOCK);
-
-					if (0 != aio_write(iocb)) {
-						TRACE("aio-write failed: %d (%s)", errno, strerror(errno));
-
-						return NETWORK_STATUS_FATAL_ERROR;
-					}
-
-					srv->have_aio_waiting++;
-
-					srv->posix_aio_iocbs_watch[iocb_ndx] = iocb;
-					srv->posix_aio_data[iocb_ndx] = con;
-
-					/* in case we come back: we have written everything */
-					c->file.copy.offset =  c->file.copy.length;
-
-					return NETWORK_STATUS_WAIT_FOR_AIO_EVENT;
-#endif
-				}
-
-				if (-1 == (r = write(sock->fd, c->file.mmap.start + c->file.copy.offset, c->file.copy.length - c->file.copy.offset))) {
-					switch (errno) {
-					case EINTR:
-					case EAGAIN:
-						return NETWORK_STATUS_WAIT_FOR_EVENT;
-					case EPIPE:
-					case ECONNRESET:
-						return NETWORK_STATUS_CONNECTION_CLOSE;
-					default:
-						ERROR("write failed: %d (%s) [%jd, %p, %jd]", 
-								errno, strerror(errno), (intmax_t) c->file.copy.length,
-								c->file.mmap.start, (intmax_t) c->file.copy.offset);
-						return NETWORK_STATUS_FATAL_ERROR;
-					}
-				}
-
-				if (r == 0) {
-					return NETWORK_STATUS_CONNECTION_CLOSE;
-				}
-
-				c->file.copy.offset += r; /* offset in the copy-chunk */
-
-				c->offset += r; /* global offset in the file */
-				cq->bytes_out += r;
-
-				if ((off_t) c->file.mmap.length == c->file.copy.offset) {
-					munmap(c->file.mmap.start, c->file.mmap.length);
-					c->file.mmap.start = MAP_FAILED;
-					c->file.copy.length = 0;
-				}
-
-				if (c->offset == c->file.length) {
-					chunk_finished = 1;
-
-					if (c->file.copy.fd != -1) {
-						close(c->file.copy.fd);
-						c->file.copy.fd = -1;
-					}
-
-					if (c->file.fd != -1) {
-						close(c->file.fd);
-						c->file.fd = -1;
-					}
-				}
-
-				/* the chunk is larger and the current snippet is finished */
-			} while (c->file.copy.length == 0 && chunk_finished == 0 && rounds-- > 0);
-
-			break;
-		}
-		default:
-
-			log_error_write(srv, __FILE__, __LINE__, "ds", c, "type not known");
-
-			return NETWORK_STATUS_FATAL_ERROR;
-		}
-
-		if (!chunk_finished) {
-			/* not finished yet */
-
-			return NETWORK_STATUS_WAIT_FOR_EVENT;
-		}
-	}
-
-	return NETWORK_STATUS_SUCCESS;
-}
-
-#endif
-