[experimental-ims] 7a24aa3 Start #include reorg. The table-building #includes will all go into the tbl/ subdirectory
Geoff Simmons
geoff at varnish-cache.org
Mon Jan 9 21:52:14 CET 2012
commit 7a24aa37d753c951a1df67709e3e3238d6befac7
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Sat Oct 8 14:25:44 2011 +0000
Start #include reorg. The table-building #includes will all go into
the tbl/ subdirectory
diff --git a/bin/varnishd/cache.h b/bin/varnishd/cache.h
index 5a91dd8..11e952e 100644
--- a/bin/varnishd/cache.h
+++ b/bin/varnishd/cache.h
@@ -224,7 +224,7 @@ struct acct {
#define VSC_F(n, t, l, f, e,d) L##l(t, n)
#define VSC_DO_MAIN
struct dstat {
-#include "vsc_fields.h"
+#include "tbl/vsc_fields.h"
};
#undef VSC_F
#undef VSC_DO_MAIN
diff --git a/bin/varnishd/cache_wrk.c b/bin/varnishd/cache_wrk.c
index ba2e41a..bb88664 100644
--- a/bin/varnishd/cache_wrk.c
+++ b/bin/varnishd/cache_wrk.c
@@ -53,7 +53,7 @@ wrk_sumstat(struct worker *w)
#define L1(n) (VSC_C_main->n += w->stats.n)
#define VSC_DO_MAIN
#define VSC_F(n, t, l, f, d, e) L##l(n);
-#include "vsc_fields.h"
+#include "tbl/vsc_fields.h"
#undef VSC_F
#undef VSC_DO_MAIN
#undef L0
diff --git a/include/Makefile.am b/include/Makefile.am
index f0e2daf..3f2994c 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,14 +1,14 @@
#
pkginclude_HEADERS = \
- vsm.h \
- vsl.h \
+ tbl/vsc_all.h \
+ tbl/vsc_fields.h \
+ tbl/vsl_tags.h \
+ varnishapi.h \
vcli.h \
- vsl_tags.h \
- vsc_fields.h \
- vsc_all.h \
vsc.h \
- varnishapi.h
+ vsl.h \
+ vsm.h
nobase_noinst_HEADERS = \
ban_vars.h \
diff --git a/include/tbl/README b/include/tbl/README
new file mode 100644
index 0000000..bbb9afc
--- /dev/null
+++ b/include/tbl/README
@@ -0,0 +1,4 @@
+The include files in this directory are special, they are used to
+define sets of objects using macros, such that a list of all such
+objects can be compiled into the code by including these files with
+a properly defined macro.
diff --git a/include/tbl/vsc_all.h b/include/tbl/vsc_all.h
new file mode 100644
index 0000000..e12bd2f
--- /dev/null
+++ b/include/tbl/vsc_all.h
@@ -0,0 +1,60 @@
+/*-
+ * Copyright (c) 2010 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.
+ *
+ */
+
+
+
+VSC_DO(LCK, lck, VSC_TYPE_LCK)
+#define VSC_DO_LCK
+#include "tbl/vsc_fields.h"
+#undef VSC_DO_LCK
+VSC_DONE(LCK, lck, VSC_TYPE_LCK)
+
+VSC_DO(MAIN, main, VSC_TYPE_MAIN)
+#define VSC_DO_MAIN
+#include "tbl/vsc_fields.h"
+#undef VSC_DO_MAIN
+VSC_DONE(MAIN, main, VSC_TYPE_MAIN)
+
+VSC_DO(SMA, sma, VSC_TYPE_SMA)
+#define VSC_DO_SMA
+#include "tbl/vsc_fields.h"
+#undef VSC_DO_SMA
+VSC_DONE(SMA, sma, VSC_TYPE_SMA)
+
+VSC_DO(SMF, smf, VSC_TYPE_SMF)
+#define VSC_DO_SMF
+#include "tbl/vsc_fields.h"
+#undef VSC_DO_SMF
+VSC_DONE(SMF, smf, VSC_TYPE_SMF)
+
+VSC_DO(VBE, vbe, VSC_TYPE_VBE)
+#define VSC_DO_VBE
+#include "tbl/vsc_fields.h"
+#undef VSC_DO_VBE
+VSC_DONE(VBE, vbe, VSC_TYPE_VBE)
diff --git a/include/tbl/vsc_fields.h b/include/tbl/vsc_fields.h
new file mode 100644
index 0000000..0fd7e46
--- /dev/null
+++ b/include/tbl/vsc_fields.h
@@ -0,0 +1,376 @@
+/*-
+ * 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.
+ *
+ * Definition of all shared memory statistics below.
+ *
+ * Fields (n, t, l, f, e, d):
+ * n - Name: Field name, in C-source and stats programs
+ * t - Type: C-type, uint64_t, unless marked in 'f'
+ * l - Local: Local counter in worker thread.
+ * f - Format: Semantics of the value in this field
+ * 'a' - Accumulator (deprecated, use 'c')
+ * 'b' - Bitmap
+ * 'c' - Counter, never decreases.
+ * 'g' - Gauge, goes up and down
+ * 'i' - Integer (deprecated, use 'g')
+ * e - Explantion: Short explanation of field (for screen use)
+ * d - Description: Long explanation of field (for doc use)
+ *
+ * -----------------------
+ * NB: Cleanup in progress
+ * -----------------------
+ *
+ * Insufficient attention has caused this to become a swamp of conflicting
+ * conventions, shorthands and general mumbo-jumbo. I'm trying to clean
+ * it up as I go over the code in other business.
+ *
+ * Please see the sessmem section for how it should look.
+ *
+ */
+
+/**********************************************************************/
+
+#ifdef VSC_DO_MAIN
+
+/*---------------------------------------------------------------------
+ * Sessions
+ * see: cache_acceptor.c and cache_pool.c
+ */
+
+VSC_F(sess_conn, uint64_t, 1, 'c',
+ "Sessions accepted",
+ "Count of sessions succesfully accepted"
+)
+VSC_F(sess_drop, uint64_t, 1, 'c',
+ "Sessions dropped",
+ "Count of sessions silently dropped due to lack of session memory."
+ " See parameter 'max_sess'."
+)
+
+VSC_F(sess_fail, uint64_t, 1, 'c',
+ "Session accept failures",
+ "Count of failures to accept TCP connection."
+ " Either the client changed its mind, or the kernel ran out of"
+ " some resource like filedescriptors."
+)
+
+/*---------------------------------------------------------------------*/
+
+VSC_F(client_req, uint64_t, 1, 'a',
+ "Client requests received",
+ "")
+
+VSC_F(cache_hit, uint64_t, 1, 'a',
+ "Cache hits",
+ "Count of cache hits. "
+ " A cache hit indicates that an object has been delivered to a"
+ " client without fetching it from a backend server."
+)
+
+VSC_F(cache_hitpass, uint64_t, 1, 'a',
+ "Cache hits for pass",
+ "Count of hits for pass"
+ " A cache hit for pass indicates that Varnish is going to"
+ " pass the request to the backend and this decision has been "
+ " cached in it self. This counts how many times the cached "
+ " decision is being used."
+)
+VSC_F(cache_miss, uint64_t, 1, 'a',
+ "Cache misses",
+ "Count of misses"
+ " A cache miss indicates the object was fetched from the"
+ " backend before delivering it to the backend.")
+
+VSC_F(backend_conn, uint64_t, 0, 'a',
+ "Backend conn. success",
+ "")
+
+VSC_F(backend_unhealthy, uint64_t, 0, 'a',
+ "Backend conn. not attempted",
+ ""
+)
+VSC_F(backend_busy, uint64_t, 0, 'a', "Backend conn. too many", "")
+VSC_F(backend_fail, uint64_t, 0, 'a', "Backend conn. failures", "")
+VSC_F(backend_reuse, uint64_t, 0, 'a',
+ "Backend conn. reuses",
+ "Count of backend connection reuses"
+ " This counter is increased whenever we reuse a recycled connection.")
+VSC_F(backend_toolate, uint64_t, 0, 'a', "Backend conn. was closed", "")
+VSC_F(backend_recycle, uint64_t, 0, 'a',
+ "Backend conn. recycles",
+ "Count of backend connection recycles"
+ " This counter is increased whenever we have a keep-alive"
+ " connection that is put back into the pool of connections."
+ " It has not yet been used, but it might be, unless the backend"
+ " closes it.")
+VSC_F(backend_retry, uint64_t, 0, 'a', "Backend conn. retry", "")
+
+VSC_F(fetch_head, uint64_t, 1, 'a', "Fetch head", "")
+VSC_F(fetch_length, uint64_t, 1, 'a', "Fetch with Length", "")
+VSC_F(fetch_chunked, uint64_t, 1, 'a', "Fetch chunked", "")
+VSC_F(fetch_eof, uint64_t, 1, 'a', "Fetch EOF", "")
+VSC_F(fetch_bad, uint64_t, 1, 'a', "Fetch had bad headers", "")
+VSC_F(fetch_close, uint64_t, 1, 'a', "Fetch wanted close", "")
+VSC_F(fetch_oldhttp, uint64_t, 1, 'a', "Fetch pre HTTP/1.1 closed", "")
+VSC_F(fetch_zero, uint64_t, 1, 'a', "Fetch zero len", "")
+VSC_F(fetch_failed, uint64_t, 1, 'a', "Fetch failed", "")
+VSC_F(fetch_1xx, uint64_t, 1, 'a', "Fetch no body (1xx)", "")
+VSC_F(fetch_204, uint64_t, 1, 'a', "Fetch no body (204)", "")
+VSC_F(fetch_304, uint64_t, 1, 'a', "Fetch no body (304)", "")
+
+/*---------------------------------------------------------------------
+ * Session Memory
+ * see: cache_session.c
+ */
+
+VSC_F(sessmem_size, uint64_t, 1, 'g',
+ "Session mem size",
+ "Bytes of memory allocated for last allocated session."
+)
+
+VSC_F(sessmem_alloc, uint64_t, 1, 'c',
+ "Session mem allocated",
+ "Count of all allocations of session memory."
+)
+
+VSC_F(sessmem_free, uint64_t, 1, 'c',
+ "Session mem freed",
+ "Count of all frees of session memory."
+)
+
+VSC_F(sessmem_fail, uint64_t, 1, 'c',
+ "Session mem alloc failed",
+ "Count of session memory allocation failures."
+)
+
+VSC_F(sessmem_limit, uint64_t, 1, 'c',
+ "Session mem alloc limited",
+ "Count of session memory allocations blocked by limit (max_sess)."
+)
+
+/*---------------------------------------------------------------------
+ * Pools, threads, and sessions
+ * see: cache_pool.c
+ *
+ */
+
+VSC_F(pools, uint64_t, 1, 'g',
+ "Number of thread pools",
+ "Number of thread pools. See also param wthread_pools."
+ " NB: Presently pools cannot be removed once created."
+)
+
+VSC_F(threads, uint64_t, 1, 'g',
+ "Total number of threads",
+ "Number of threads in all pools."
+ " See also params thread_pools, thread_pool_min & thread_pool_max."
+)
+
+VSC_F(threads_limited, uint64_t, 1, 'c',
+ "Threads hit max",
+ "Number of times more threads were needed, but limit was reached"
+ " in a thread pool."
+ " See also param thread_pool_max."
+)
+
+VSC_F(threads_created, uint64_t, 1, 'c',
+ "Threads created",
+ "Total number of threads created in all pools."
+)
+
+VSC_F(threads_destroyed, uint64_t, 1, 'c',
+ "Threads destoryed",
+ "Total number of threads destroyed in all pools."
+)
+
+VSC_F(threads_failed, uint64_t, 1, 'c',
+ "Thread creation failed",
+ "Number of times creating a thread failed."
+ " See VSL::Debug for diagnostics."
+ " See also param thread_fail_delay."
+)
+
+VSC_F(thread_queue_len, uint64_t, 1, 'g',
+ "Length of session queue",
+ "Length of session queue waiting for threads."
+ " NB: Only updates once per second."
+ " See also param queue_max."
+)
+
+VSC_F(sess_queued, uint64_t, 1, 'c',
+ "Sessions queued for thread",
+ "Number of times session was queued waiting for a thread."
+ " See also param queue_max."
+)
+
+VSC_F(sess_dropped, uint64_t, 1, 'c',
+ "Sessions dropped for thread",
+ "Number of times session was dropped because the queue were too"
+ " long already."
+ " See also param queue_max."
+)
+
+/*---------------------------------------------------------------------*/
+
+VSC_F(n_sess_mem, uint64_t, 0, 'i', "N struct sess_mem", "")
+VSC_F(n_sess, uint64_t, 0, 'i', "N struct sess", "")
+VSC_F(n_object, uint64_t, 1, 'i', "N struct object", "")
+VSC_F(n_vampireobject, uint64_t, 1, 'i', "N unresurrected objects", "")
+VSC_F(n_objectcore, uint64_t, 1, 'i', "N struct objectcore", "")
+VSC_F(n_objecthead, uint64_t, 1, 'i', "N struct objecthead", "")
+VSC_F(n_waitinglist, uint64_t, 1, 'i', "N struct waitinglist", "")
+
+VSC_F(n_vbc, uint64_t, 0, 'i', "N struct vbc", "")
+
+VSC_F(n_backend, uint64_t, 0, 'i', "N backends", "")
+
+VSC_F(n_expired, uint64_t, 0, 'i', "N expired objects", "")
+VSC_F(n_lru_nuked, uint64_t, 0, 'i', "N LRU nuked objects", "")
+VSC_F(n_lru_moved, uint64_t, 0, 'i', "N LRU moved objects", "")
+
+VSC_F(losthdr, uint64_t, 0, 'a', "HTTP header overflows", "")
+
+VSC_F(n_objsendfile, uint64_t, 0, 'a', "Objects sent with sendfile",
+ "The number of objects sent with the sendfile system call. If enabled "
+ "sendfile will be used on object larger than a certain size.")
+VSC_F(n_objwrite, uint64_t, 0, 'a', "Objects sent with write",
+ "The number of objects sent with regular write calls."
+ "Writes are used when the objects are too small for sendfile "
+ "or if the sendfile call has been disabled")
+VSC_F(n_objoverflow, uint64_t, 1, 'a',
+ "Objects overflowing workspace", "")
+
+VSC_F(s_sess, uint64_t, 1, 'a', "Total Sessions", "")
+VSC_F(s_req, uint64_t, 1, 'a', "Total Requests", "")
+VSC_F(s_pipe, uint64_t, 1, 'a', "Total pipe", "")
+VSC_F(s_pass, uint64_t, 1, 'a', "Total pass", "")
+VSC_F(s_fetch, uint64_t, 1, 'a', "Total fetch", "")
+VSC_F(s_hdrbytes, uint64_t, 1, 'a', "Total header bytes", "")
+VSC_F(s_bodybytes, uint64_t, 1, 'a', "Total body bytes", "")
+
+VSC_F(sess_closed, uint64_t, 1, 'a', "Session Closed", "")
+VSC_F(sess_pipeline, uint64_t, 1, 'a', "Session Pipeline", "")
+VSC_F(sess_readahead, uint64_t, 1, 'a', "Session Read Ahead", "")
+VSC_F(sess_linger, uint64_t, 1, 'a', "Session Linger", "")
+VSC_F(sess_herd, uint64_t, 1, 'a', "Session herd", "")
+
+VSC_F(shm_records, uint64_t, 0, 'a', "SHM records", "")
+VSC_F(shm_writes, uint64_t, 0, 'a', "SHM writes", "")
+VSC_F(shm_flushes, uint64_t, 0, 'a', "SHM flushes due to overflow", "")
+VSC_F(shm_cont, uint64_t, 0, 'a', "SHM MTX contention", "")
+VSC_F(shm_cycles, uint64_t, 0, 'a', "SHM cycles through buffer", "")
+
+VSC_F(sms_nreq, uint64_t, 0, 'a', "SMS allocator requests", "")
+VSC_F(sms_nobj, uint64_t, 0, 'i', "SMS outstanding allocations", "")
+VSC_F(sms_nbytes, uint64_t, 0, 'i', "SMS outstanding bytes", "")
+VSC_F(sms_balloc, uint64_t, 0, 'i', "SMS bytes allocated", "")
+VSC_F(sms_bfree, uint64_t, 0, 'i', "SMS bytes freed", "")
+
+VSC_F(backend_req, uint64_t, 0, 'a', "Backend requests made", "")
+
+VSC_F(n_vcl, uint64_t, 0, 'a', "N vcl total", "")
+VSC_F(n_vcl_avail, uint64_t, 0, 'a', "N vcl available", "")
+VSC_F(n_vcl_discard, uint64_t, 0, 'a', "N vcl discarded", "")
+
+VSC_F(n_ban, uint64_t, 0, 'i', "N total active bans", "")
+VSC_F(n_ban_add, uint64_t, 0, 'a', "N new bans added", "")
+VSC_F(n_ban_retire, uint64_t, 0, 'a', "N old bans deleted", "")
+VSC_F(n_ban_obj_test, uint64_t, 0, 'a', "N objects tested", "")
+VSC_F(n_ban_re_test, uint64_t, 0, 'a', "N regexps tested against", "")
+VSC_F(n_ban_dups, uint64_t, 0, 'a', "N duplicate bans removed", "")
+
+VSC_F(hcb_nolock, uint64_t, 0, 'a', "HCB Lookups without lock", "")
+VSC_F(hcb_lock, uint64_t, 0, 'a', "HCB Lookups with lock", "")
+VSC_F(hcb_insert, uint64_t, 0, 'a', "HCB Inserts", "")
+
+VSC_F(esi_errors, uint64_t, 0, 'a', "ESI parse errors (unlock)", "")
+VSC_F(esi_warnings, uint64_t, 0, 'a', "ESI parse warnings (unlock)", "")
+VSC_F(client_drop_late, uint64_t, 0, 'a', "Connection dropped late", "")
+VSC_F(uptime, uint64_t, 0, 'a', "Client uptime", "")
+
+VSC_F(dir_dns_lookups, uint64_t, 0, 'a', "DNS director lookups", "")
+VSC_F(dir_dns_failed, uint64_t, 0, 'a', "DNS director failed lookups", "")
+VSC_F(dir_dns_hit, uint64_t, 0, 'a', "DNS director cached lookups hit", "")
+VSC_F(dir_dns_cache_full, uint64_t, 0, 'a', "DNS director full dnscache", "")
+
+VSC_F(vmods, uint64_t, 0, 'i', "Loaded VMODs", "")
+
+VSC_F(n_gzip, uint64_t, 0, 'a', "Gzip operations", "")
+VSC_F(n_gunzip, uint64_t, 0, 'a', "Gunzip operations", "")
+
+#endif
+
+/**********************************************************************/
+
+#ifdef VSC_DO_LCK
+
+VSC_F(creat, uint64_t, 0, 'a', "Created locks", "")
+VSC_F(destroy, uint64_t, 0, 'a', "Destroyed locks", "")
+VSC_F(locks, uint64_t, 0, 'a', "Lock Operations", "")
+VSC_F(colls, uint64_t, 0, 'a', "Collisions", "")
+
+#endif
+
+/**********************************************************************
+ * All Stevedores support these counters
+ */
+
+#if defined(VSC_DO_SMA) || defined (VSC_DO_SMF)
+VSC_F(c_req, uint64_t, 0, 'a', "Allocator requests", "")
+VSC_F(c_fail, uint64_t, 0, 'a', "Allocator failures", "")
+VSC_F(c_bytes, uint64_t, 0, 'a', "Bytes allocated", "")
+VSC_F(c_freed, uint64_t, 0, 'a', "Bytes freed", "")
+VSC_F(g_alloc, uint64_t, 0, 'i', "Allocations outstanding", "")
+VSC_F(g_bytes, uint64_t, 0, 'i', "Bytes outstanding", "")
+VSC_F(g_space, uint64_t, 0, 'i', "Bytes available", "")
+#endif
+
+
+/**********************************************************************/
+
+#ifdef VSC_DO_SMA
+/* No SMA specific counters */
+#endif
+
+/**********************************************************************/
+
+#ifdef VSC_DO_SMF
+VSC_F(g_smf, uint64_t, 0, 'i', "N struct smf", "")
+VSC_F(g_smf_frag, uint64_t, 0, 'i', "N small free smf", "")
+VSC_F(g_smf_large, uint64_t, 0, 'i', "N large free smf", "")
+#endif
+
+/**********************************************************************/
+
+#ifdef VSC_DO_VBE
+
+VSC_F(vcls, uint64_t, 0, 'i', "VCL references", "")
+VSC_F(happy, uint64_t, 0, 'b', "Happy health probes", "")
+
+#endif
+
diff --git a/include/tbl/vsl_tags.h b/include/tbl/vsl_tags.h
new file mode 100644
index 0000000..21ca1df
--- /dev/null
+++ b/include/tbl/vsl_tags.h
@@ -0,0 +1,103 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2010 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.
+ *
+ * Define the tags in the shared memory in a reusable format.
+ * Whoever includes this get to define what the SLTM macro does.
+ *
+ * REMEMBER to update the documentation (especially the varnishlog(1) man
+ * page) whenever this list changes.
+ *
+ * XXX: Please add new entries a the end to not break saved log-segments.
+ * XXX: we can resort them when we have a major release.
+ */
+
+SLTM(Debug)
+SLTM(Error)
+SLTM(CLI)
+SLTM(StatSess)
+SLTM(ReqEnd)
+SLTM(SessionOpen)
+SLTM(SessionClose)
+SLTM(BackendOpen)
+SLTM(BackendXID)
+SLTM(BackendReuse)
+SLTM(BackendClose)
+SLTM(HttpGarbage)
+SLTM(Backend)
+SLTM(Length)
+
+SLTM(FetchError)
+
+SLTM(RxRequest)
+SLTM(RxResponse)
+SLTM(RxStatus)
+SLTM(RxURL)
+SLTM(RxProtocol)
+SLTM(RxHeader)
+
+SLTM(TxRequest)
+SLTM(TxResponse)
+SLTM(TxStatus)
+SLTM(TxURL)
+SLTM(TxProtocol)
+SLTM(TxHeader)
+
+SLTM(ObjRequest)
+SLTM(ObjResponse)
+SLTM(ObjStatus)
+SLTM(ObjURL)
+SLTM(ObjProtocol)
+SLTM(ObjHeader)
+
+SLTM(LostHeader)
+
+SLTM(TTL)
+SLTM(Fetch_Body)
+SLTM(VCL_acl)
+SLTM(VCL_call)
+SLTM(VCL_trace)
+SLTM(VCL_return)
+SLTM(VCL_error)
+SLTM(ReqStart)
+SLTM(Hit)
+SLTM(HitPass)
+SLTM(ExpBan)
+SLTM(ExpKill)
+SLTM(WorkThread)
+
+SLTM(ESI_xmlerror)
+
+SLTM(Hash)
+
+SLTM(Backend_health)
+
+SLTM(VCL_Debug)
+SLTM(VCL_Log)
+SLTM(VCL_Error)
+
+SLTM(Gzip)
diff --git a/include/vsc.h b/include/vsc.h
index 7cb3235..0a9cbf9 100644
--- a/include/vsc.h
+++ b/include/vsc.h
@@ -43,7 +43,7 @@
#define VSC_DO(u,l,t) struct VSC_C_##l {
#define VSC_DONE(u,l,t) };
-#include "vsc_all.h"
+#include "tbl/vsc_all.h"
#undef VSC_DO
#undef VSC_F
diff --git a/include/vsc_all.h b/include/vsc_all.h
deleted file mode 100644
index 24fa8ec..0000000
--- a/include/vsc_all.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 2010 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.
- *
- */
-
-
-
-VSC_DO(LCK, lck, VSC_TYPE_LCK)
-#define VSC_DO_LCK
-#include "vsc_fields.h"
-#undef VSC_DO_LCK
-VSC_DONE(LCK, lck, VSC_TYPE_LCK)
-
-VSC_DO(MAIN, main, VSC_TYPE_MAIN)
-#define VSC_DO_MAIN
-#include "vsc_fields.h"
-#undef VSC_DO_MAIN
-VSC_DONE(MAIN, main, VSC_TYPE_MAIN)
-
-VSC_DO(SMA, sma, VSC_TYPE_SMA)
-#define VSC_DO_SMA
-#include "vsc_fields.h"
-#undef VSC_DO_SMA
-VSC_DONE(SMA, sma, VSC_TYPE_SMA)
-
-VSC_DO(SMF, smf, VSC_TYPE_SMF)
-#define VSC_DO_SMF
-#include "vsc_fields.h"
-#undef VSC_DO_SMF
-VSC_DONE(SMF, smf, VSC_TYPE_SMF)
-
-VSC_DO(VBE, vbe, VSC_TYPE_VBE)
-#define VSC_DO_VBE
-#include "vsc_fields.h"
-#undef VSC_DO_VBE
-VSC_DONE(VBE, vbe, VSC_TYPE_VBE)
diff --git a/include/vsc_fields.h b/include/vsc_fields.h
deleted file mode 100644
index 0fd7e46..0000000
--- a/include/vsc_fields.h
+++ /dev/null
@@ -1,376 +0,0 @@
-/*-
- * 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.
- *
- * Definition of all shared memory statistics below.
- *
- * Fields (n, t, l, f, e, d):
- * n - Name: Field name, in C-source and stats programs
- * t - Type: C-type, uint64_t, unless marked in 'f'
- * l - Local: Local counter in worker thread.
- * f - Format: Semantics of the value in this field
- * 'a' - Accumulator (deprecated, use 'c')
- * 'b' - Bitmap
- * 'c' - Counter, never decreases.
- * 'g' - Gauge, goes up and down
- * 'i' - Integer (deprecated, use 'g')
- * e - Explantion: Short explanation of field (for screen use)
- * d - Description: Long explanation of field (for doc use)
- *
- * -----------------------
- * NB: Cleanup in progress
- * -----------------------
- *
- * Insufficient attention has caused this to become a swamp of conflicting
- * conventions, shorthands and general mumbo-jumbo. I'm trying to clean
- * it up as I go over the code in other business.
- *
- * Please see the sessmem section for how it should look.
- *
- */
-
-/**********************************************************************/
-
-#ifdef VSC_DO_MAIN
-
-/*---------------------------------------------------------------------
- * Sessions
- * see: cache_acceptor.c and cache_pool.c
- */
-
-VSC_F(sess_conn, uint64_t, 1, 'c',
- "Sessions accepted",
- "Count of sessions succesfully accepted"
-)
-VSC_F(sess_drop, uint64_t, 1, 'c',
- "Sessions dropped",
- "Count of sessions silently dropped due to lack of session memory."
- " See parameter 'max_sess'."
-)
-
-VSC_F(sess_fail, uint64_t, 1, 'c',
- "Session accept failures",
- "Count of failures to accept TCP connection."
- " Either the client changed its mind, or the kernel ran out of"
- " some resource like filedescriptors."
-)
-
-/*---------------------------------------------------------------------*/
-
-VSC_F(client_req, uint64_t, 1, 'a',
- "Client requests received",
- "")
-
-VSC_F(cache_hit, uint64_t, 1, 'a',
- "Cache hits",
- "Count of cache hits. "
- " A cache hit indicates that an object has been delivered to a"
- " client without fetching it from a backend server."
-)
-
-VSC_F(cache_hitpass, uint64_t, 1, 'a',
- "Cache hits for pass",
- "Count of hits for pass"
- " A cache hit for pass indicates that Varnish is going to"
- " pass the request to the backend and this decision has been "
- " cached in it self. This counts how many times the cached "
- " decision is being used."
-)
-VSC_F(cache_miss, uint64_t, 1, 'a',
- "Cache misses",
- "Count of misses"
- " A cache miss indicates the object was fetched from the"
- " backend before delivering it to the backend.")
-
-VSC_F(backend_conn, uint64_t, 0, 'a',
- "Backend conn. success",
- "")
-
-VSC_F(backend_unhealthy, uint64_t, 0, 'a',
- "Backend conn. not attempted",
- ""
-)
-VSC_F(backend_busy, uint64_t, 0, 'a', "Backend conn. too many", "")
-VSC_F(backend_fail, uint64_t, 0, 'a', "Backend conn. failures", "")
-VSC_F(backend_reuse, uint64_t, 0, 'a',
- "Backend conn. reuses",
- "Count of backend connection reuses"
- " This counter is increased whenever we reuse a recycled connection.")
-VSC_F(backend_toolate, uint64_t, 0, 'a', "Backend conn. was closed", "")
-VSC_F(backend_recycle, uint64_t, 0, 'a',
- "Backend conn. recycles",
- "Count of backend connection recycles"
- " This counter is increased whenever we have a keep-alive"
- " connection that is put back into the pool of connections."
- " It has not yet been used, but it might be, unless the backend"
- " closes it.")
-VSC_F(backend_retry, uint64_t, 0, 'a', "Backend conn. retry", "")
-
-VSC_F(fetch_head, uint64_t, 1, 'a', "Fetch head", "")
-VSC_F(fetch_length, uint64_t, 1, 'a', "Fetch with Length", "")
-VSC_F(fetch_chunked, uint64_t, 1, 'a', "Fetch chunked", "")
-VSC_F(fetch_eof, uint64_t, 1, 'a', "Fetch EOF", "")
-VSC_F(fetch_bad, uint64_t, 1, 'a', "Fetch had bad headers", "")
-VSC_F(fetch_close, uint64_t, 1, 'a', "Fetch wanted close", "")
-VSC_F(fetch_oldhttp, uint64_t, 1, 'a', "Fetch pre HTTP/1.1 closed", "")
-VSC_F(fetch_zero, uint64_t, 1, 'a', "Fetch zero len", "")
-VSC_F(fetch_failed, uint64_t, 1, 'a', "Fetch failed", "")
-VSC_F(fetch_1xx, uint64_t, 1, 'a', "Fetch no body (1xx)", "")
-VSC_F(fetch_204, uint64_t, 1, 'a', "Fetch no body (204)", "")
-VSC_F(fetch_304, uint64_t, 1, 'a', "Fetch no body (304)", "")
-
-/*---------------------------------------------------------------------
- * Session Memory
- * see: cache_session.c
- */
-
-VSC_F(sessmem_size, uint64_t, 1, 'g',
- "Session mem size",
- "Bytes of memory allocated for last allocated session."
-)
-
-VSC_F(sessmem_alloc, uint64_t, 1, 'c',
- "Session mem allocated",
- "Count of all allocations of session memory."
-)
-
-VSC_F(sessmem_free, uint64_t, 1, 'c',
- "Session mem freed",
- "Count of all frees of session memory."
-)
-
-VSC_F(sessmem_fail, uint64_t, 1, 'c',
- "Session mem alloc failed",
- "Count of session memory allocation failures."
-)
-
-VSC_F(sessmem_limit, uint64_t, 1, 'c',
- "Session mem alloc limited",
- "Count of session memory allocations blocked by limit (max_sess)."
-)
-
-/*---------------------------------------------------------------------
- * Pools, threads, and sessions
- * see: cache_pool.c
- *
- */
-
-VSC_F(pools, uint64_t, 1, 'g',
- "Number of thread pools",
- "Number of thread pools. See also param wthread_pools."
- " NB: Presently pools cannot be removed once created."
-)
-
-VSC_F(threads, uint64_t, 1, 'g',
- "Total number of threads",
- "Number of threads in all pools."
- " See also params thread_pools, thread_pool_min & thread_pool_max."
-)
-
-VSC_F(threads_limited, uint64_t, 1, 'c',
- "Threads hit max",
- "Number of times more threads were needed, but limit was reached"
- " in a thread pool."
- " See also param thread_pool_max."
-)
-
-VSC_F(threads_created, uint64_t, 1, 'c',
- "Threads created",
- "Total number of threads created in all pools."
-)
-
-VSC_F(threads_destroyed, uint64_t, 1, 'c',
- "Threads destoryed",
- "Total number of threads destroyed in all pools."
-)
-
-VSC_F(threads_failed, uint64_t, 1, 'c',
- "Thread creation failed",
- "Number of times creating a thread failed."
- " See VSL::Debug for diagnostics."
- " See also param thread_fail_delay."
-)
-
-VSC_F(thread_queue_len, uint64_t, 1, 'g',
- "Length of session queue",
- "Length of session queue waiting for threads."
- " NB: Only updates once per second."
- " See also param queue_max."
-)
-
-VSC_F(sess_queued, uint64_t, 1, 'c',
- "Sessions queued for thread",
- "Number of times session was queued waiting for a thread."
- " See also param queue_max."
-)
-
-VSC_F(sess_dropped, uint64_t, 1, 'c',
- "Sessions dropped for thread",
- "Number of times session was dropped because the queue were too"
- " long already."
- " See also param queue_max."
-)
-
-/*---------------------------------------------------------------------*/
-
-VSC_F(n_sess_mem, uint64_t, 0, 'i', "N struct sess_mem", "")
-VSC_F(n_sess, uint64_t, 0, 'i', "N struct sess", "")
-VSC_F(n_object, uint64_t, 1, 'i', "N struct object", "")
-VSC_F(n_vampireobject, uint64_t, 1, 'i', "N unresurrected objects", "")
-VSC_F(n_objectcore, uint64_t, 1, 'i', "N struct objectcore", "")
-VSC_F(n_objecthead, uint64_t, 1, 'i', "N struct objecthead", "")
-VSC_F(n_waitinglist, uint64_t, 1, 'i', "N struct waitinglist", "")
-
-VSC_F(n_vbc, uint64_t, 0, 'i', "N struct vbc", "")
-
-VSC_F(n_backend, uint64_t, 0, 'i', "N backends", "")
-
-VSC_F(n_expired, uint64_t, 0, 'i', "N expired objects", "")
-VSC_F(n_lru_nuked, uint64_t, 0, 'i', "N LRU nuked objects", "")
-VSC_F(n_lru_moved, uint64_t, 0, 'i', "N LRU moved objects", "")
-
-VSC_F(losthdr, uint64_t, 0, 'a', "HTTP header overflows", "")
-
-VSC_F(n_objsendfile, uint64_t, 0, 'a', "Objects sent with sendfile",
- "The number of objects sent with the sendfile system call. If enabled "
- "sendfile will be used on object larger than a certain size.")
-VSC_F(n_objwrite, uint64_t, 0, 'a', "Objects sent with write",
- "The number of objects sent with regular write calls."
- "Writes are used when the objects are too small for sendfile "
- "or if the sendfile call has been disabled")
-VSC_F(n_objoverflow, uint64_t, 1, 'a',
- "Objects overflowing workspace", "")
-
-VSC_F(s_sess, uint64_t, 1, 'a', "Total Sessions", "")
-VSC_F(s_req, uint64_t, 1, 'a', "Total Requests", "")
-VSC_F(s_pipe, uint64_t, 1, 'a', "Total pipe", "")
-VSC_F(s_pass, uint64_t, 1, 'a', "Total pass", "")
-VSC_F(s_fetch, uint64_t, 1, 'a', "Total fetch", "")
-VSC_F(s_hdrbytes, uint64_t, 1, 'a', "Total header bytes", "")
-VSC_F(s_bodybytes, uint64_t, 1, 'a', "Total body bytes", "")
-
-VSC_F(sess_closed, uint64_t, 1, 'a', "Session Closed", "")
-VSC_F(sess_pipeline, uint64_t, 1, 'a', "Session Pipeline", "")
-VSC_F(sess_readahead, uint64_t, 1, 'a', "Session Read Ahead", "")
-VSC_F(sess_linger, uint64_t, 1, 'a', "Session Linger", "")
-VSC_F(sess_herd, uint64_t, 1, 'a', "Session herd", "")
-
-VSC_F(shm_records, uint64_t, 0, 'a', "SHM records", "")
-VSC_F(shm_writes, uint64_t, 0, 'a', "SHM writes", "")
-VSC_F(shm_flushes, uint64_t, 0, 'a', "SHM flushes due to overflow", "")
-VSC_F(shm_cont, uint64_t, 0, 'a', "SHM MTX contention", "")
-VSC_F(shm_cycles, uint64_t, 0, 'a', "SHM cycles through buffer", "")
-
-VSC_F(sms_nreq, uint64_t, 0, 'a', "SMS allocator requests", "")
-VSC_F(sms_nobj, uint64_t, 0, 'i', "SMS outstanding allocations", "")
-VSC_F(sms_nbytes, uint64_t, 0, 'i', "SMS outstanding bytes", "")
-VSC_F(sms_balloc, uint64_t, 0, 'i', "SMS bytes allocated", "")
-VSC_F(sms_bfree, uint64_t, 0, 'i', "SMS bytes freed", "")
-
-VSC_F(backend_req, uint64_t, 0, 'a', "Backend requests made", "")
-
-VSC_F(n_vcl, uint64_t, 0, 'a', "N vcl total", "")
-VSC_F(n_vcl_avail, uint64_t, 0, 'a', "N vcl available", "")
-VSC_F(n_vcl_discard, uint64_t, 0, 'a', "N vcl discarded", "")
-
-VSC_F(n_ban, uint64_t, 0, 'i', "N total active bans", "")
-VSC_F(n_ban_add, uint64_t, 0, 'a', "N new bans added", "")
-VSC_F(n_ban_retire, uint64_t, 0, 'a', "N old bans deleted", "")
-VSC_F(n_ban_obj_test, uint64_t, 0, 'a', "N objects tested", "")
-VSC_F(n_ban_re_test, uint64_t, 0, 'a', "N regexps tested against", "")
-VSC_F(n_ban_dups, uint64_t, 0, 'a', "N duplicate bans removed", "")
-
-VSC_F(hcb_nolock, uint64_t, 0, 'a', "HCB Lookups without lock", "")
-VSC_F(hcb_lock, uint64_t, 0, 'a', "HCB Lookups with lock", "")
-VSC_F(hcb_insert, uint64_t, 0, 'a', "HCB Inserts", "")
-
-VSC_F(esi_errors, uint64_t, 0, 'a', "ESI parse errors (unlock)", "")
-VSC_F(esi_warnings, uint64_t, 0, 'a', "ESI parse warnings (unlock)", "")
-VSC_F(client_drop_late, uint64_t, 0, 'a', "Connection dropped late", "")
-VSC_F(uptime, uint64_t, 0, 'a', "Client uptime", "")
-
-VSC_F(dir_dns_lookups, uint64_t, 0, 'a', "DNS director lookups", "")
-VSC_F(dir_dns_failed, uint64_t, 0, 'a', "DNS director failed lookups", "")
-VSC_F(dir_dns_hit, uint64_t, 0, 'a', "DNS director cached lookups hit", "")
-VSC_F(dir_dns_cache_full, uint64_t, 0, 'a', "DNS director full dnscache", "")
-
-VSC_F(vmods, uint64_t, 0, 'i', "Loaded VMODs", "")
-
-VSC_F(n_gzip, uint64_t, 0, 'a', "Gzip operations", "")
-VSC_F(n_gunzip, uint64_t, 0, 'a', "Gunzip operations", "")
-
-#endif
-
-/**********************************************************************/
-
-#ifdef VSC_DO_LCK
-
-VSC_F(creat, uint64_t, 0, 'a', "Created locks", "")
-VSC_F(destroy, uint64_t, 0, 'a', "Destroyed locks", "")
-VSC_F(locks, uint64_t, 0, 'a', "Lock Operations", "")
-VSC_F(colls, uint64_t, 0, 'a', "Collisions", "")
-
-#endif
-
-/**********************************************************************
- * All Stevedores support these counters
- */
-
-#if defined(VSC_DO_SMA) || defined (VSC_DO_SMF)
-VSC_F(c_req, uint64_t, 0, 'a', "Allocator requests", "")
-VSC_F(c_fail, uint64_t, 0, 'a', "Allocator failures", "")
-VSC_F(c_bytes, uint64_t, 0, 'a', "Bytes allocated", "")
-VSC_F(c_freed, uint64_t, 0, 'a', "Bytes freed", "")
-VSC_F(g_alloc, uint64_t, 0, 'i', "Allocations outstanding", "")
-VSC_F(g_bytes, uint64_t, 0, 'i', "Bytes outstanding", "")
-VSC_F(g_space, uint64_t, 0, 'i', "Bytes available", "")
-#endif
-
-
-/**********************************************************************/
-
-#ifdef VSC_DO_SMA
-/* No SMA specific counters */
-#endif
-
-/**********************************************************************/
-
-#ifdef VSC_DO_SMF
-VSC_F(g_smf, uint64_t, 0, 'i', "N struct smf", "")
-VSC_F(g_smf_frag, uint64_t, 0, 'i', "N small free smf", "")
-VSC_F(g_smf_large, uint64_t, 0, 'i', "N large free smf", "")
-#endif
-
-/**********************************************************************/
-
-#ifdef VSC_DO_VBE
-
-VSC_F(vcls, uint64_t, 0, 'i', "VCL references", "")
-VSC_F(happy, uint64_t, 0, 'b', "Happy health probes", "")
-
-#endif
-
diff --git a/include/vsl.h b/include/vsl.h
index 7f771ce..64b0516 100644
--- a/include/vsl.h
+++ b/include/vsl.h
@@ -74,7 +74,7 @@
enum VSL_tag_e {
SLT_Bogus = 0,
#define SLTM(foo) SLT_##foo,
-#include "vsl_tags.h"
+#include "tbl/vsl_tags.h"
#undef SLTM
SLT_Reserved = 255
};
diff --git a/include/vsl_tags.h b/include/vsl_tags.h
deleted file mode 100644
index 21ca1df..0000000
--- a/include/vsl_tags.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2010 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.
- *
- * Define the tags in the shared memory in a reusable format.
- * Whoever includes this get to define what the SLTM macro does.
- *
- * REMEMBER to update the documentation (especially the varnishlog(1) man
- * page) whenever this list changes.
- *
- * XXX: Please add new entries a the end to not break saved log-segments.
- * XXX: we can resort them when we have a major release.
- */
-
-SLTM(Debug)
-SLTM(Error)
-SLTM(CLI)
-SLTM(StatSess)
-SLTM(ReqEnd)
-SLTM(SessionOpen)
-SLTM(SessionClose)
-SLTM(BackendOpen)
-SLTM(BackendXID)
-SLTM(BackendReuse)
-SLTM(BackendClose)
-SLTM(HttpGarbage)
-SLTM(Backend)
-SLTM(Length)
-
-SLTM(FetchError)
-
-SLTM(RxRequest)
-SLTM(RxResponse)
-SLTM(RxStatus)
-SLTM(RxURL)
-SLTM(RxProtocol)
-SLTM(RxHeader)
-
-SLTM(TxRequest)
-SLTM(TxResponse)
-SLTM(TxStatus)
-SLTM(TxURL)
-SLTM(TxProtocol)
-SLTM(TxHeader)
-
-SLTM(ObjRequest)
-SLTM(ObjResponse)
-SLTM(ObjStatus)
-SLTM(ObjURL)
-SLTM(ObjProtocol)
-SLTM(ObjHeader)
-
-SLTM(LostHeader)
-
-SLTM(TTL)
-SLTM(Fetch_Body)
-SLTM(VCL_acl)
-SLTM(VCL_call)
-SLTM(VCL_trace)
-SLTM(VCL_return)
-SLTM(VCL_error)
-SLTM(ReqStart)
-SLTM(Hit)
-SLTM(HitPass)
-SLTM(ExpBan)
-SLTM(ExpKill)
-SLTM(WorkThread)
-
-SLTM(ESI_xmlerror)
-
-SLTM(Hash)
-
-SLTM(Backend_health)
-
-SLTM(VCL_Debug)
-SLTM(VCL_Log)
-SLTM(VCL_Error)
-
-SLTM(Gzip)
diff --git a/lib/libvarnishapi/vsc.c b/lib/libvarnishapi/vsc.c
index 25a1948..18f1fc7 100644
--- a/lib/libvarnishapi/vsc.c
+++ b/lib/libvarnishapi/vsc.c
@@ -309,7 +309,7 @@ iter_call(const struct vsc *vsc, VSC_iter_f *func, void *priv,
return (0); \
}
-#include "vsc_all.h"
+#include "tbl/vsc_all.h"
#undef VSC_DO
#undef VSC_F
#undef VSC_DONE
@@ -339,7 +339,7 @@ VSC_Iter(struct VSM_data *vd, VSC_iter_f *func, void *priv)
if (!i) \
continue; \
}
-#include "vsc_all.h"
+#include "tbl/vsc_all.h"
#undef VSC_F
#undef VSC_DO
#undef VSC_DONE
diff --git a/lib/libvarnishapi/vsl.c b/lib/libvarnishapi/vsl.c
index 8a54c9f..ab538c5 100644
--- a/lib/libvarnishapi/vsl.c
+++ b/lib/libvarnishapi/vsl.c
@@ -53,7 +53,7 @@
const char *VSL_tags[256] = {
#define SLTM(foo) [SLT_##foo] = #foo,
-#include "vsl_tags.h"
+#include "tbl/vsl_tags.h"
#undef SLTM
};
diff --git a/man/vsc2rst.c b/man/vsc2rst.c
index e6abcf9..ad5dec6 100644
--- a/man/vsc2rst.c
+++ b/man/vsc2rst.c
@@ -27,7 +27,7 @@ int main(int argc, char **argv)
P("=============");
P("");
#define VSC_DO_MAIN
-#include "vsc_fields.h"
+#include "tbl/vsc_fields.h"
#undef VSC_DO_MAIN
P("");
@@ -35,7 +35,7 @@ int main(int argc, char **argv)
P("=============");
P("");
#define VSC_DO_LCK
-#include "vsc_fields.h"
+#include "tbl/vsc_fields.h"
#undef VSC_DO_LCK
P("");
@@ -43,7 +43,7 @@ int main(int argc, char **argv)
P("===========================");
P("");
#define VSC_DO_SMA
-#include "vsc_fields.h"
+#include "tbl/vsc_fields.h"
#undef VSC_DO_SMA
P("");
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
P("=========================");
P("");
#define VSC_DO_SMF
-#include "vsc_fields.h"
+#include "tbl/vsc_fields.h"
#undef VSC_DO_SMF
P("");
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
P("====================");
P("");
#define VSC_DO_VBE
-#include "vsc_fields.h"
+#include "tbl/vsc_fields.h"
#undef VSC_DO_VBE
return 0;
More information about the varnish-commit
mailing list