[master] 68cf6f8 Split 'struct pool' into a private include file.
Poul-Henning Kamp
phk at FreeBSD.org
Tue May 26 22:36:43 CEST 2015
commit 68cf6f868c0d8ae63914839b583467d2369620f2
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Tue May 26 19:29:47 2015 +0000
Split 'struct pool' into a private include file.
diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index ac3b216..1b11581 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -100,6 +100,7 @@ varnishd_SOURCES = \
noinst_HEADERS = \
builtin_vcl.h \
cache/cache_esi.h \
+ cache/cache_pool.h \
common/heritage.h \
hash/hash_slinger.h \
mgt/mgt.h \
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 4bec380..730966c 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -39,35 +39,10 @@
#include <stdlib.h>
#include "cache.h"
+#include "cache_pool.h"
#include "vtim.h"
-VTAILQ_HEAD(taskhead, pool_task);
-
-/* Number of work requests queued in excess of worker threads available */
-
-struct pool {
- unsigned magic;
-#define POOL_MAGIC 0x606658fa
- VTAILQ_ENTRY(pool) list;
-
- pthread_cond_t herder_cond;
- pthread_t herder_thr;
-
- struct lock mtx;
- struct taskhead idle_queue;
- struct taskhead front_queue;
- struct taskhead back_queue;
- unsigned nthr;
- unsigned dry;
- unsigned lqueue;
- uintmax_t ndropped;
- uintmax_t nqueued;
- struct sesspool *sesspool;
- struct dstat *a_stat;
- struct dstat *b_stat;
-};
-
static struct lock pool_mtx;
static pthread_t thr_pool_herder;
diff --git a/bin/varnishd/cache/cache_pool.h b/bin/varnishd/cache/cache_pool.h
new file mode 100644
index 0000000..7660d7a
--- /dev/null
+++ b/bin/varnishd/cache/cache_pool.h
@@ -0,0 +1,56 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2011 Varnish Software 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.
+ *
+ * Private include file for the pool aware code.
+ */
+
+#include "config.h"
+
+VTAILQ_HEAD(taskhead, pool_task);
+
+struct pool {
+ unsigned magic;
+#define POOL_MAGIC 0x606658fa
+ VTAILQ_ENTRY(pool) list;
+
+ pthread_cond_t herder_cond;
+ pthread_t herder_thr;
+
+ struct lock mtx;
+ struct taskhead idle_queue;
+ struct taskhead front_queue;
+ struct taskhead back_queue;
+ unsigned nthr;
+ unsigned dry;
+ unsigned lqueue;
+ uintmax_t ndropped;
+ uintmax_t nqueued;
+ struct sesspool *sesspool;
+ struct dstat *a_stat;
+ struct dstat *b_stat;
+};
More information about the varnish-commit
mailing list