r4083 - trunk/varnish-cache/bin/varnishd
phk at projects.linpro.no
phk at projects.linpro.no
Tue May 19 19:48:35 CEST 2009
Author: phk
Date: 2009-05-19 19:48:35 +0200 (Tue, 19 May 2009)
New Revision: 4083
Added:
trunk/varnish-cache/bin/varnishd/cachw_wrw.c
Modified:
trunk/varnish-cache/bin/varnishd/Makefile.am
trunk/varnish-cache/bin/varnishd/cache_pool.c
Log:
Segregrate the WRW functions into their own source file, before we
do unnatural things to them.
Modified: trunk/varnish-cache/bin/varnishd/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishd/Makefile.am 2009-05-19 07:14:00 UTC (rev 4082)
+++ trunk/varnish-cache/bin/varnishd/Makefile.am 2009-05-19 17:48:35 UTC (rev 4083)
@@ -38,6 +38,7 @@
cache_vcl.c \
cache_vrt.c \
cache_vrt_re.c \
+ cache_wrw.c \
cache_ws.c \
hash_classic.c \
hash_critbit.c \
Modified: trunk/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pool.c 2009-05-19 07:14:00 UTC (rev 4082)
+++ trunk/varnish-cache/bin/varnishd/cache_pool.c 2009-05-19 17:48:35 UTC (rev 4083)
@@ -45,20 +45,7 @@
#include "config.h"
#include <sys/types.h>
-#include <sys/uio.h>
-#ifdef SENDFILE_WORKS
-#if defined(__FreeBSD__) || defined(__DragonFly__)
-#include <sys/socket.h>
-#elif defined(__linux__)
-#include <sys/sendfile.h>
-#elif defined(__sun)
-#include <sys/sendfile.h>
-#else
-#error Unknown sendfile() implementation
-#endif
-#endif /* SENDFILE_WORKS */
-
#include <errno.h>
#include <stdio.h>
#include <math.h>
@@ -100,169 +87,6 @@
static struct lock herder_mtx;
static struct lock wstat_mtx;
-/*--------------------------------------------------------------------
- * Write data to fd
- * We try to use writev() if possible in order to minimize number of
- * syscalls made and packets sent. It also just might allow the worker
- * thread to complete the request without holding stuff locked.
- */
-
-void
-WRW_Reserve(struct worker *w, int *fd)
-{
-
- CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
- AZ(w->wfd);
- w->werr = 0;
- w->liov = 0;
- w->niov = 0;
- w->wfd = fd;
-}
-
-void
-WRW_Release(struct worker *w)
-{
-
- CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
- w->werr = 0;
- w->liov = 0;
- w->niov = 0;
- w->wfd = NULL;
-}
-
-unsigned
-WRW_Flush(struct worker *w)
-{
- ssize_t i;
-
- CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
- AN(w->wfd);
- if (*w->wfd >= 0 && w->niov > 0 && w->werr == 0) {
- i = writev(*w->wfd, w->iov, w->niov);
- if (i != w->liov) {
- w->werr++;
- WSL(w, SLT_Debug, *w->wfd,
- "Write error, len = %d/%d, errno = %s",
- i, w->liov, strerror(errno));
- }
- }
- w->liov = 0;
- w->niov = 0;
- return (w->werr);
-}
-
-unsigned
-WRW_FlushRelease(struct worker *w)
-{
- unsigned u;
-
- CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
- AN(w->wfd);
- u = WRW_Flush(w);
- WRW_Release(w);
- return (u);
-}
-
-unsigned
-WRW_WriteH(struct worker *w, const txt *hh, const char *suf)
-{
- unsigned u;
-
- CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
- AN(w->wfd);
- AN(w);
- AN(hh);
- AN(hh->b);
- AN(hh->e);
- u = WRW_Write(w, hh->b, hh->e - hh->b);
- if (suf != NULL)
- u += WRW_Write(w, suf, -1);
- return (u);
-}
-
-unsigned
-WRW_Write(struct worker *w, const void *ptr, int len)
-{
-
- CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
- AN(w->wfd);
- if (len == 0 || *w->wfd < 0)
- return (0);
- if (len == -1)
- len = strlen(ptr);
- if (w->niov == MAX_IOVS)
- (void)WRW_Flush(w);
- w->iov[w->niov].iov_base = TRUST_ME(ptr);
- w->iov[w->niov].iov_len = len;
- w->liov += len;
- w->niov++;
- return (len);
-}
-
-#ifdef SENDFILE_WORKS
-void
-WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len)
-{
-
- CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
- AN(w->wfd);
- assert(fd >= 0);
- assert(len > 0);
-
-#if defined(__FreeBSD__) || defined(__DragonFly__)
- do {
- struct sf_hdtr sfh;
- memset(&sfh, 0, sizeof sfh);
- if (w->niov > 0) {
- sfh.headers = w->iov;
- sfh.hdr_cnt = w->niov;
- }
- if (sendfile(fd, *w->wfd, off, len, &sfh, NULL, 0) != 0)
- w->werr++;
- w->liov = 0;
- w->niov = 0;
- } while (0);
-#elif defined(__linux__)
- do {
- if (WRK_Flush(w) == 0 &&
- sendfile(*w->wfd, fd, &off, len) != len)
- w->werr++;
- } while (0);
-#elif defined(__sun) && defined(HAVE_SENDFILEV)
- do {
- sendfilevec_t svvec[HTTP_HDR_MAX * 2 + 1];
- size_t xferred = 0, expected = 0;
- int i;
- for (i = 0; i < w->niov; i++) {
- svvec[i].sfv_fd = SFV_FD_SELF;
- svvec[i].sfv_flag = 0;
- svvec[i].sfv_off = (off_t) w->iov[i].iov_base;
- svvec[i].sfv_len = w->iov[i].iov_len;
- expected += svvec[i].sfv_len;
- }
- svvec[i].sfv_fd = fd;
- svvec[i].sfv_flag = 0;
- svvec[i].sfv_off = off;
- svvec[i].sfv_len = len;
- expected += svvec[i].sfv_len;
- if (sendfilev(*w->wfd, svvec, i, &xferred) == -1 ||
- xferred != expected)
- w->werr++;
- w->liov = 0;
- w->niov = 0;
- } while (0);
-#elif defined(__sun) && defined(HAVE_SENDFILE)
- do {
- if (WRK_Flush(w) == 0 &&
- sendfile(*w->wfd, fd, &off, len) != len)
- w->werr++;
- } while (0);
-#else
-#error Unknown sendfile() implementation
-#endif
-}
-#endif /* SENDFILE_WORKS */
-
/*--------------------------------------------------------------------*/
static void
Copied: trunk/varnish-cache/bin/varnishd/cachw_wrw.c (from rev 4082, trunk/varnish-cache/bin/varnishd/cache_pool.c)
===================================================================
--- trunk/varnish-cache/bin/varnishd/cachw_wrw.c (rev 0)
+++ trunk/varnish-cache/bin/varnishd/cachw_wrw.c 2009-05-19 17:48:35 UTC (rev 4083)
@@ -0,0 +1,227 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2009 Linpro AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id$
+ *
+ * We maintain a number of worker thread pools, to spread lock contention.
+ *
+ * Pools can be added on the fly, as a means to mitigate lock contention,
+ * but can only be removed again by a restart. (XXX: we could fix that)
+ *
+ * Two threads herd the pools, one eliminates idle threads and aggregates
+ * statistics for all the pools, the other thread creates new threads
+ * on demand, subject to various numerical constraints.
+ *
+ * The algorithm for when to create threads needs to be reactive enough
+ * to handle startup spikes, but sufficiently attenuated to not cause
+ * thread pileups. This remains subject for improvement.
+ */
+
+#include "config.h"
+
+#include <sys/types.h>
+#include <sys/uio.h>
+
+#ifdef SENDFILE_WORKS
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+#include <sys/socket.h>
+#elif defined(__linux__)
+#include <sys/sendfile.h>
+#elif defined(__sun)
+#include <sys/sendfile.h>
+#else
+#error Unknown sendfile() implementation
+#endif
+#endif /* SENDFILE_WORKS */
+
+#include "shmlog.h"
+#include "cache.h"
+
+/*--------------------------------------------------------------------
+ * Write data to fd
+ * We try to use writev() if possible in order to minimize number of
+ * syscalls made and packets sent. It also just might allow the worker
+ * thread to complete the request without holding stuff locked.
+ */
+
+void
+WRW_Reserve(struct worker *w, int *fd)
+{
+
+ CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
+ AZ(w->wfd);
+ w->werr = 0;
+ w->liov = 0;
+ w->niov = 0;
+ w->wfd = fd;
+}
+
+void
+WRW_Release(struct worker *w)
+{
+
+ CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
+ w->werr = 0;
+ w->liov = 0;
+ w->niov = 0;
+ w->wfd = NULL;
+}
+
+unsigned
+WRW_Flush(struct worker *w)
+{
+ ssize_t i;
+
+ CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
+ AN(w->wfd);
+ if (*w->wfd >= 0 && w->niov > 0 && w->werr == 0) {
+ i = writev(*w->wfd, w->iov, w->niov);
+ if (i != w->liov) {
+ w->werr++;
+ WSL(w, SLT_Debug, *w->wfd,
+ "Write error, len = %d/%d, errno = %s",
+ i, w->liov, strerror(errno));
+ }
+ }
+ w->liov = 0;
+ w->niov = 0;
+ return (w->werr);
+}
+
+unsigned
+WRW_FlushRelease(struct worker *w)
+{
+ unsigned u;
+
+ CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
+ AN(w->wfd);
+ u = WRW_Flush(w);
+ WRW_Release(w);
+ return (u);
+}
+
+unsigned
+WRW_WriteH(struct worker *w, const txt *hh, const char *suf)
+{
+ unsigned u;
+
+ CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
+ AN(w->wfd);
+ AN(w);
+ AN(hh);
+ AN(hh->b);
+ AN(hh->e);
+ u = WRW_Write(w, hh->b, hh->e - hh->b);
+ if (suf != NULL)
+ u += WRW_Write(w, suf, -1);
+ return (u);
+}
+
+unsigned
+WRW_Write(struct worker *w, const void *ptr, int len)
+{
+
+ CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
+ AN(w->wfd);
+ if (len == 0 || *w->wfd < 0)
+ return (0);
+ if (len == -1)
+ len = strlen(ptr);
+ if (w->niov == MAX_IOVS)
+ (void)WRW_Flush(w);
+ w->iov[w->niov].iov_base = TRUST_ME(ptr);
+ w->iov[w->niov].iov_len = len;
+ w->liov += len;
+ w->niov++;
+ return (len);
+}
+
+#ifdef SENDFILE_WORKS
+void
+WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len)
+{
+
+ CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
+ AN(w->wfd);
+ assert(fd >= 0);
+ assert(len > 0);
+
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+ do {
+ struct sf_hdtr sfh;
+ memset(&sfh, 0, sizeof sfh);
+ if (w->niov > 0) {
+ sfh.headers = w->iov;
+ sfh.hdr_cnt = w->niov;
+ }
+ if (sendfile(fd, *w->wfd, off, len, &sfh, NULL, 0) != 0)
+ w->werr++;
+ w->liov = 0;
+ w->niov = 0;
+ } while (0);
+#elif defined(__linux__)
+ do {
+ if (WRK_Flush(w) == 0 &&
+ sendfile(*w->wfd, fd, &off, len) != len)
+ w->werr++;
+ } while (0);
+#elif defined(__sun) && defined(HAVE_SENDFILEV)
+ do {
+ sendfilevec_t svvec[HTTP_HDR_MAX * 2 + 1];
+ size_t xferred = 0, expected = 0;
+ int i;
+ for (i = 0; i < w->niov; i++) {
+ svvec[i].sfv_fd = SFV_FD_SELF;
+ svvec[i].sfv_flag = 0;
+ svvec[i].sfv_off = (off_t) w->iov[i].iov_base;
+ svvec[i].sfv_len = w->iov[i].iov_len;
+ expected += svvec[i].sfv_len;
+ }
+ svvec[i].sfv_fd = fd;
+ svvec[i].sfv_flag = 0;
+ svvec[i].sfv_off = off;
+ svvec[i].sfv_len = len;
+ expected += svvec[i].sfv_len;
+ if (sendfilev(*w->wfd, svvec, i, &xferred) == -1 ||
+ xferred != expected)
+ w->werr++;
+ w->liov = 0;
+ w->niov = 0;
+ } while (0);
+#elif defined(__sun) && defined(HAVE_SENDFILE)
+ do {
+ if (WRK_Flush(w) == 0 &&
+ sendfile(*w->wfd, fd, &off, len) != len)
+ w->werr++;
+ } while (0);
+#else
+#error Unknown sendfile() implementation
+#endif
+}
+#endif /* SENDFILE_WORKS */
+
More information about the varnish-commit
mailing list