[master] 042a98b Simplify make rules for vsc files and remove duplication
Nils Goroll
nils.goroll at uplex.de
Thu Oct 5 16:56:06 UTC 2017
commit 042a98bcf1dd9314e70255df923561e4be1a2517
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Thu Oct 5 17:41:31 2017 +0200
Simplify make rules for vsc files and remove duplication
We use an implicit rule to tell make how to turn vsc into c and
manually define the vsc files in Makefile.am. The implicit rule tells
automake to add .vsc to SUFFIXES, which in turn allows us to add the
actual vscs to varnishd_SOURCES.
To avoid triple configuration of the list of built VSC .c and .h
files, we generate these in configure. AC_SUBSTing files into _SOURCES
is forbidden by autoconf for a good reason: Adding sources to the
build should remain an explicit process to avoid accidentally
compiling in code just because someone had files with a magic name
lying around.
As the implicit .vsc -> .c rule does not allow for additional
dependencies, we add in the dependency to vsctool using the
auto-generated list of c files.
BUILT_SOURCES is used to ensure that, for default make targets,
headers generated from vscs are always present before the actual
varnishd sources are being build, of which some depend on vsc
headers. For subsequent builds, include dependency tracking takes
over.
The Makefile rules are deliberately simple to hopefully cover all make
flavours available on the planet. Notice that, for example, if we
limited ourselves to gmake, we could use much simpler substitution
rules to generate VSC_GEN_C and _H instead of the de-tour via
configure.
Portability is also the reason for renaming all vsc files.
diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index 9873301..87f7f82 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -218,112 +218,25 @@ DISTCLEANFILES += vhp_hufdec.h
#######################################################################
-VSC_main.c: VSC_main.h
+.vsc.c:
+ $(PYTHON) $(top_srcdir)/lib/libvcc/vsctool.py -ch $<
-VSC_main.h: $(srcdir)/main.vsc $(top_srcdir)/lib/libvcc/vsctool.py
- $(PYTHON) $(top_srcdir)/lib/libvcc/vsctool.py -ch $(srcdir)/main.vsc
+VSC_SRC = \
+ VSC_main.vsc \
+ VSC_lck.vsc \
+ VSC_vbe.vsc \
+ VSC_sma.vsc \
+ VSC_smu.vsc \
+ VSC_smf.vsc \
+ VSC_mempool.vsc \
+ VSC_mgt.vsc
-$(varnishd_OBJECTS): VSC_main.c VSC_main.h
+VSC_GEN_C = @VSC_GEN_C@
+VSC_GEN_H = @VSC_GEN_H@
-EXTRA_DIST += main.vsc
-DISTCLEANFILES += VSC_main.c VSC_main.h
-BUILT_SOURCES += VSC_main.c VSC_main.h
-nodist_varnishd_SOURCES += VSC_main.c
+$(VSC_GEN_C): $(top_srcdir)/lib/libvcc/vsctool.py
-#######################################################################
-
-VSC_lck.c: VSC_lck.h
-
-VSC_lck.h: $(srcdir)/lck.vsc $(top_srcdir)/lib/libvcc/vsctool.py
- $(PYTHON) $(top_srcdir)/lib/libvcc/vsctool.py -ch $(srcdir)/lck.vsc
-
-$(varnishd_OBJECTS): VSC_lck.c VSC_lck.h
-
-EXTRA_DIST += lck.vsc
-DISTCLEANFILES += VSC_lck.c VSC_lck.h
-BUILT_SOURCES += VSC_lck.c VSC_lck.h
-nodist_varnishd_SOURCES += VSC_lck.c
-
-#######################################################################
-
-VSC_vbe.c: VSC_vbe.h
-
-VSC_vbe.h: $(srcdir)/vbe.vsc $(top_srcdir)/lib/libvcc/vsctool.py
- $(PYTHON) $(top_srcdir)/lib/libvcc/vsctool.py -ch $(srcdir)/vbe.vsc
-
-$(varnishd_OBJECTS): VSC_vbe.c VSC_vbe.h
-
-EXTRA_DIST += vbe.vsc
-DISTCLEANFILES += VSC_vbe.c VSC_vbe.h
-BUILT_SOURCES += VSC_vbe.c VSC_vbe.h
-nodist_varnishd_SOURCES += VSC_vbe.c
-
-#######################################################################
-
-VSC_sma.c: VSC_sma.h
-
-VSC_sma.h: $(srcdir)/sma.vsc $(top_srcdir)/lib/libvcc/vsctool.py
- $(PYTHON) $(top_srcdir)/lib/libvcc/vsctool.py -ch $(srcdir)/sma.vsc
-
-$(varnishd_OBJECTS): VSC_sma.c VSC_sma.h
-
-EXTRA_DIST += sma.vsc
-DISTCLEANFILES += VSC_sma.c VSC_sma.h
-BUILT_SOURCES += VSC_sma.c VSC_sma.h
-nodist_varnishd_SOURCES += VSC_sma.c
-
-#######################################################################
-
-VSC_smu.c: VSC_smu.h
-
-VSC_smu.h: $(srcdir)/smu.vsc $(top_srcdir)/lib/libvcc/vsctool.py
- $(PYTHON) $(top_srcdir)/lib/libvcc/vsctool.py -ch $(srcdir)/smu.vsc
-
-$(varnishd_OBJECTS): VSC_smu.c VSC_smu.h
-
-EXTRA_DIST += smu.vsc
-DISTCLEANFILES += VSC_smu.c VSC_smu.h
-BUILT_SOURCES += VSC_smu.c VSC_smu.h
-nodist_varnishd_SOURCES += VSC_smu.c
-
-#######################################################################
-
-VSC_smf.c: VSC_smf.h
-
-VSC_smf.h: $(srcdir)/smf.vsc $(top_srcdir)/lib/libvcc/vsctool.py
- $(PYTHON) $(top_srcdir)/lib/libvcc/vsctool.py -ch $(srcdir)/smf.vsc
-
-$(varnishd_OBJECTS): VSC_smf.c VSC_smf.h
-
-EXTRA_DIST += smf.vsc
-DISTCLEANFILES += VSC_smf.c VSC_smf.h
-BUILT_SOURCES += VSC_smf.c VSC_smf.h
-nodist_varnishd_SOURCES += VSC_smf.c
-
-#######################################################################
-
-VSC_mempool.c: VSC_mempool.h
-
-VSC_mempool.h: $(srcdir)/mempool.vsc $(top_srcdir)/lib/libvcc/vsctool.py
- $(PYTHON) $(top_srcdir)/lib/libvcc/vsctool.py -ch $(srcdir)/mempool.vsc
-
-$(varnishd_OBJECTS): VSC_mempool.c VSC_mempool.h
-
-EXTRA_DIST += mempool.vsc
-DISTCLEANFILES += VSC_mempool.c VSC_mempool.h
-BUILT_SOURCES += VSC_mempool.c VSC_mempool.h
-nodist_varnishd_SOURCES += VSC_mempool.c
-
-#######################################################################
-
-VSC_mgt.c: VSC_mgt.h
-
-VSC_mgt.h: $(srcdir)/mgt.vsc $(top_srcdir)/lib/libvcc/vsctool.py
- $(PYTHON) $(top_srcdir)/lib/libvcc/vsctool.py -ch $(srcdir)/mgt.vsc
-
-$(varnishd_OBJECTS): VSC_mgt.c VSC_mgt.h
+BUILT_SOURCES += $(VSC_GEN_C)
+CLEANFILES = $(VSC_GEN_C) $(VSC_GEN_H)
-EXTRA_DIST += mgt.vsc
-DISTCLEANFILES += VSC_mgt.c VSC_mgt.h
-BUILT_SOURCES += VSC_mgt.c VSC_mgt.h
-nodist_varnishd_SOURCES += VSC_mgt.c
+varnishd_SOURCES += $(VSC_SRC)
diff --git a/bin/varnishd/VSC_lck.vsc b/bin/varnishd/VSC_lck.vsc
new file mode 100644
index 0000000..75b69be
--- /dev/null
+++ b/bin/varnishd/VSC_lck.vsc
@@ -0,0 +1,31 @@
+..
+ This is *NOT* a RST file but the syntax has been chosen so
+ that it may become an RST file at some later date.
+
+.. varnish_vsc_begin:: lck
+ :oneliner: Lock Counters
+ :order: 70
+
+ Counters which track the activity in the different classes
+ of mutex-locks.
+
+.. varnish_vsc:: creat
+ :type: counter
+ :level: debug
+ :oneliner: Created locks
+
+
+.. varnish_vsc:: destroy
+ :type: counter
+ :level: debug
+ :oneliner: Destroyed locks
+
+
+.. varnish_vsc:: locks
+ :type: counter
+ :level: debug
+ :oneliner: Lock Operations
+
+
+.. varnish_vsc_end:: lck
+
diff --git a/bin/varnishd/VSC_main.vsc b/bin/varnishd/VSC_main.vsc
new file mode 100644
index 0000000..ca999f7
--- /dev/null
+++ b/bin/varnishd/VSC_main.vsc
@@ -0,0 +1,731 @@
+..
+ This is *NOT* a RST file but the syntax has been chosen so
+ that it may become an RST file at some later date.
+
+.. varnish_vsc_begin:: main
+ :oneliner: Main counters
+ :order: 10
+ :sumfunction:
+
+.. varnish_vsc:: summs
+ :level: debug
+ :oneliner: stat summ operations
+
+.. varnish_vsc:: uptime
+ :oneliner: Child process uptime
+ :format: duration
+
+ How long the child process has been running.
+
+.. varnish_vsc:: sess_conn
+ :oneliner: Sessions accepted
+
+ Count of sessions successfully accepted
+
+.. varnish_vsc:: sess_drop
+ :oneliner: Sessions dropped
+
+ Count of sessions silently dropped due to lack of worker thread.
+
+.. varnish_vsc:: sess_fail
+ :oneliner: 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 file
+ descriptors.
+
+.. varnish_vsc:: client_req_400
+ :oneliner: Client requests received, subject to 400 errors
+
+ 400 means we couldn't make sense of the request, it was malformed
+ in some drastic way.
+
+.. varnish_vsc:: client_req_417
+ :oneliner: Client requests received, subject to 417 errors
+
+ 417 means that something went wrong with an Expect: header.
+
+.. varnish_vsc:: client_req
+ :oneliner: Good client requests received
+
+ The count of parseable client requests seen.
+
+.. varnish_vsc:: cache_hit
+ :oneliner: 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.
+
+.. varnish_vsc:: cache_hitpass
+ :oneliner: 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.
+
+.. varnish_vsc:: cache_hitmiss
+ :oneliner: Cache hits for miss.
+
+ Count of hits for miss. A cache hit for miss indicates that Varnish
+ is going to proceed as for a cache miss without request coalescing,
+ and this decision has been cached. This counts how many times the
+ cached decision is being used.
+
+.. varnish_vsc:: cache_miss
+ :oneliner: Cache misses
+
+ Count of misses. A cache miss indicates the object was fetched from
+ the backend before delivering it to the client.
+
+.. varnish_vsc:: backend_conn
+ :oneliner: Backend conn. success
+
+ How many backend connections have successfully been established.
+
+.. varnish_vsc:: backend_unhealthy
+ :oneliner: Backend conn. not attempted
+
+
+.. varnish_vsc:: backend_busy
+ :oneliner: Backend conn. too many
+
+
+.. varnish_vsc:: backend_fail
+ :oneliner: Backend conn. failures
+
+
+.. varnish_vsc:: backend_reuse
+ :oneliner: Backend conn. reuses
+
+ Count of backend connection reuses. This counter is increased
+ whenever we reuse a recycled connection.
+
+.. varnish_vsc:: backend_recycle
+ :oneliner: 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.
+
+.. varnish_vsc:: backend_retry
+ :oneliner: Backend conn. retry
+
+
+.. varnish_vsc:: fetch_head
+ :oneliner: Fetch no body (HEAD)
+
+ beresp with no body because the request is HEAD.
+
+.. varnish_vsc:: fetch_length
+ :oneliner: Fetch with Length
+
+ beresp.body with Content-Length.
+
+.. varnish_vsc:: fetch_chunked
+ :oneliner: Fetch chunked
+
+ beresp.body with Chunked.
+
+.. varnish_vsc:: fetch_eof
+ :oneliner: Fetch EOF
+
+ beresp.body with EOF.
+
+.. varnish_vsc:: fetch_bad
+ :oneliner: Fetch bad T-E
+
+ beresp.body length/fetch could not be determined.
+
+.. varnish_vsc:: fetch_none
+ :oneliner: Fetch no body
+
+ beresp.body empty
+
+.. varnish_vsc:: fetch_1xx
+ :oneliner: Fetch no body (1xx)
+
+ beresp with no body because of 1XX response.
+
+.. varnish_vsc:: fetch_204
+ :oneliner: Fetch no body (204)
+
+ beresp with no body because of 204 response.
+
+.. varnish_vsc:: fetch_304
+ :oneliner: Fetch no body (304)
+
+ beresp with no body because of 304 response.
+
+.. varnish_vsc:: fetch_failed
+ :oneliner: Fetch failed (all causes)
+
+ beresp fetch failed.
+
+.. varnish_vsc:: fetch_no_thread
+ :oneliner: Fetch failed (no thread)
+
+ beresp fetch failed, no thread available.
+
+.. varnish_vsc:: pools
+ :type: gauge
+ :oneliner: Number of thread pools
+
+ Number of thread pools. See also parameter thread_pools. NB: Presently
+ pools cannot be removed once created.
+
+.. varnish_vsc:: threads
+ :type: gauge
+ :oneliner: Total number of threads
+
+ Number of threads in all pools. See also parameters thread_pools,
+ thread_pool_min and thread_pool_max.
+
+.. varnish_vsc:: threads_limited
+ :oneliner: Threads hit max
+
+ Number of times more threads were needed, but limit was reached in
+ a thread pool. See also parameter thread_pool_max.
+
+.. varnish_vsc:: threads_created
+ :oneliner: Threads created
+
+ Total number of threads created in all pools.
+
+.. varnish_vsc:: threads_destroyed
+ :oneliner: Threads destroyed
+
+ Total number of threads destroyed in all pools.
+
+.. varnish_vsc:: threads_failed
+ :oneliner: Thread creation failed
+
+ Number of times creating a thread failed. See VSL::Debug for
+ diagnostics. See also parameter thread_fail_delay.
+
+.. varnish_vsc:: thread_queue_len
+ :type: gauge
+ :oneliner: Length of session queue
+
+ Length of session queue waiting for threads. NB: Only updates once
+ per second. See also parameter thread_queue_limit.
+
+.. varnish_vsc:: busy_sleep
+ :oneliner: Number of requests sent to sleep on busy objhdr
+
+ Number of requests sent to sleep without a worker thread because
+ they found a busy object.
+
+.. varnish_vsc:: busy_wakeup
+ :oneliner: Number of requests woken after sleep on busy objhdr
+
+ Number of requests taken off the busy object sleep list and rescheduled.
+
+.. varnish_vsc:: busy_killed
+ :oneliner: Number of requests killed after sleep on busy objhdr
+
+ Number of requests killed from the busy object sleep list due to
+ lack of resources.
+
+.. varnish_vsc:: sess_queued
+ :oneliner: Sessions queued for thread
+
+ Number of times session was queued waiting for a thread. See also
+ parameter thread_queue_limit.
+
+.. varnish_vsc:: sess_dropped
+ :oneliner: Sessions dropped for thread
+
+ Number of times an HTTP/1 session was dropped because the queue was
+ too long already. See also parameter thread_queue_limit.
+
+.. varnish_vsc:: req_dropped
+ :oneliner: Requests dropped
+
+ Number of times an HTTP/2 stream was refused because the queue was
+ too long already. See also parameter thread_queue_limit.
+
+.. varnish_vsc:: n_object
+ :type: gauge
+ :oneliner: object structs made
+
+ Approximate number of HTTP objects (headers + body, if present) in
+ the cache.
+
+.. varnish_vsc:: n_vampireobject
+ :type: gauge
+ :level: diag
+ :oneliner: unresurrected objects
+
+ Number of unresurrected objects
+
+.. varnish_vsc:: n_objectcore
+ :type: gauge
+ :oneliner: objectcore structs made
+
+ Approximate number of object metadata elements in the cache. Each
+ object needs an objectcore, extra objectcores are for hit-for-miss,
+ hit-for-pass and busy objects.
+
+.. varnish_vsc:: n_objecthead
+ :type: gauge
+ :oneliner: objecthead structs made
+
+ Approximate number of different hash entries in the cache.
+
+.. varnish_vsc:: n_backend
+ :type: gauge
+ :oneliner: Number of backends
+
+ Number of backends known to us.
+
+.. varnish_vsc:: n_expired
+ :type: gauge
+ :oneliner: Number of expired objects
+
+ Number of objects that expired from cache because of old age.
+
+.. varnish_vsc:: n_lru_nuked
+ :type: gauge
+ :oneliner: Number of LRU nuked objects
+
+ How many objects have been forcefully evicted from storage to make
+ room for a new object.
+
+.. varnish_vsc:: n_lru_moved
+ :type: gauge
+ :level: diag
+ :oneliner: Number of LRU moved objects
+
+ Number of move operations done on the LRU list.
+
+.. varnish_vsc:: losthdr
+ :oneliner: HTTP header overflows
+
+
+.. varnish_vsc:: s_sess
+ :oneliner: Total sessions seen
+
+
+.. varnish_vsc:: s_pipe
+ :oneliner: Total pipe sessions seen
+
+
+.. varnish_vsc:: s_pass
+ :oneliner: Total pass-ed requests seen
+
+
+.. varnish_vsc:: s_fetch
+ :oneliner: Total backend fetches initiated
+
+
+.. varnish_vsc:: s_synth
+ :oneliner: Total synthethic responses made
+
+
+.. varnish_vsc:: s_req_hdrbytes
+ :oneliner: Request header bytes
+ :format: bytes
+
+ Total request header bytes received
+
+.. varnish_vsc:: s_req_bodybytes
+ :oneliner: Request body bytes
+ :format: bytes
+
+ Total request body bytes received
+
+.. varnish_vsc:: s_resp_hdrbytes
+ :oneliner: Response header bytes
+ :format: bytes
+
+ Total response header bytes transmitted
+
+.. varnish_vsc:: s_resp_bodybytes
+ :oneliner: Response body bytes
+ :format: bytes
+
+ Total response body bytes transmitted
+ :format: bytes
+
+.. varnish_vsc:: s_pipe_hdrbytes
+ :oneliner: Pipe request header bytes
+ :format: bytes
+
+ Total request bytes received for piped sessions
+
+.. varnish_vsc:: s_pipe_in
+ :oneliner: Piped bytes from client
+ :format: bytes
+
+ Total number of bytes forwarded from clients in pipe sessions
+
+.. varnish_vsc:: s_pipe_out
+ :oneliner: Piped bytes to client
+ :format: bytes
+
+ Total number of bytes forwarded to clients in pipe sessions
+
+.. varnish_vsc:: sess_closed
+ :oneliner: Session Closed
+
+
+.. varnish_vsc:: sess_closed_err
+ :oneliner: Session Closed with error
+
+ Total number of sessions closed with errors. See sc_* diag counters
+ for detailed breakdown
+
+.. varnish_vsc:: sess_readahead
+ :oneliner: Session Read Ahead
+
+
+.. varnish_vsc:: sess_herd
+ :level: diag
+ :oneliner: Session herd
+
+ Number of times the timeout_linger triggered
+
+.. varnish_vsc:: sc_rem_close
+ :level: diag
+ :oneliner: Session OK REM_CLOSE
+
+ Number of session closes with REM_CLOSE (Client Closed)
+
+.. varnish_vsc:: sc_req_close
+ :level: diag
+ :oneliner: Session OK REQ_CLOSE
+
+ Number of session closes with REQ_CLOSE (Client requested close)
+
+.. varnish_vsc:: sc_req_http10
+ :level: diag
+ :oneliner: Session Err REQ_HTTP10
+
+ Number of session closes with Error REQ_HTTP10 (Proto < HTTP/1.1)
+
+.. varnish_vsc:: sc_rx_bad
+ :level: diag
+ :oneliner: Session Err RX_BAD
+
+ Number of session closes with Error RX_BAD (Received bad req/resp)
+
+.. varnish_vsc:: sc_rx_body
+ :level: diag
+ :oneliner: Session Err RX_BODY
+
+ Number of session closes with Error RX_BODY (Failure receiving req.body)
+
+.. varnish_vsc:: sc_rx_junk
+ :level: diag
+ :oneliner: Session Err RX_JUNK
+
+ Number of session closes with Error RX_JUNK (Received junk data)
+
+.. varnish_vsc:: sc_rx_overflow
+ :level: diag
+ :oneliner: Session Err RX_OVERFLOW
+
+ Number of session closes with Error RX_OVERFLOW (Received buffer overflow)
+
+.. varnish_vsc:: sc_rx_timeout
+ :level: diag
+ :oneliner: Session Err RX_TIMEOUT
+
+ Number of session closes with Error RX_TIMEOUT (Receive timeout)
+
+.. varnish_vsc:: sc_tx_pipe
+ :level: diag
+ :oneliner: Session OK TX_PIPE
+
+ Number of session closes with TX_PIPE (Piped transaction)
+
+.. varnish_vsc:: sc_tx_error
+ :level: diag
+ :oneliner: Session Err TX_ERROR
+
+ Number of session closes with Error TX_ERROR (Error transaction)
+
+.. varnish_vsc:: sc_tx_eof
+ :level: diag
+ :oneliner: Session OK TX_EOF
+
+ Number of session closes with TX_EOF (EOF transmission)
+
+.. varnish_vsc:: sc_resp_close
+ :level: diag
+ :oneliner: Session OK RESP_CLOSE
+
+ Number of session closes with RESP_CLOSE (Backend/VCL requested close)
+
+.. varnish_vsc:: sc_overload
+ :level: diag
+ :oneliner: Session Err OVERLOAD
+
+ Number of session closes with Error OVERLOAD (Out of some resource)
+
+.. varnish_vsc:: sc_pipe_overflow
+ :level: diag
+ :oneliner: Session Err PIPE_OVERFLOW
+
+ Number of session closes with Error PIPE_OVERFLOW (Session pipe overflow)
+
+.. varnish_vsc:: sc_range_short
+ :level: diag
+ :oneliner: Session Err RANGE_SHORT
+
+ Number of session closes with Error RANGE_SHORT (Insufficient data for range)
+
+.. varnish_vsc:: sc_req_http20
+ :level: diag
+ :oneliner: Session Err REQ_HTTP20
+
+ Number of session closes with Error REQ_HTTP20 (HTTP2 not accepted)
+
+.. varnish_vsc:: sc_vcl_failure
+ :level: diag
+ :oneliner: Session Err VCL_FAILURE
+
+ Number of session closes with Error VCL_FAILURE (VCL failure)
+
+.. varnish_vsc:: shm_records
+ :level: diag
+ :oneliner: SHM records
+
+
+.. varnish_vsc:: shm_writes
+ :level: diag
+ :oneliner: SHM writes
+
+
+.. varnish_vsc:: shm_flushes
+ :level: diag
+ :oneliner: SHM flushes due to overflow
+
+
+.. varnish_vsc:: shm_cont
+ :level: diag
+ :oneliner: SHM MTX contention
+
+
+.. varnish_vsc:: shm_cycles
+ :level: diag
+ :oneliner: SHM cycles through buffer
+
+
+.. varnish_vsc:: backend_req
+ :oneliner: Backend requests made
+
+
+.. varnish_vsc:: n_vcl
+ :type: gauge
+ :oneliner: Number of loaded VCLs in total
+
+
+.. varnish_vsc:: n_vcl_avail
+ :type: gauge
+ :level: diag
+ :oneliner: Number of VCLs available
+
+
+.. varnish_vsc:: n_vcl_discard
+ :type: gauge
+ :level: diag
+ :oneliner: Number of discarded VCLs
+
+
+.. varnish_vsc:: vcl_fail
+ :oneliner: VCL failures
+
+ Count of failures which prevented VCL from completing.
+
+.. varnish_vsc:: bans
+ :type: gauge
+ :oneliner: Count of bans
+
+ Number of all bans in system, including bans superseded by newer
+ bans and bans already checked by the ban-lurker.
+
+.. varnish_vsc:: bans_completed
+ :type: gauge
+ :level: diag
+ :oneliner: Number of bans marked 'completed'
+
+ Number of bans which are no longer active, either because they got
+ checked by the ban-lurker or superseded by newer identical bans.
+
+.. varnish_vsc:: bans_obj
+ :type: gauge
+ :level: diag
+ :oneliner: Number of bans using obj.*
+
+ Number of bans which use obj.* variables. These bans can possibly
+ be washed by the ban-lurker.
+
+.. varnish_vsc:: bans_req
+ :type: gauge
+ :level: diag
+ :oneliner: Number of bans using req.*
+
+ Number of bans which use req.* variables. These bans can not be
+ washed by the ban-lurker.
+
+.. varnish_vsc:: bans_added
+ :level: diag
+ :oneliner: Bans added
+
+ Counter of bans added to ban list.
+
+.. varnish_vsc:: bans_deleted
+ :level: diag
+ :oneliner: Bans deleted
+
+ Counter of bans deleted from ban list.
+
+.. varnish_vsc:: bans_tested
+ :level: diag
+ :oneliner: Bans tested against objects (lookup)
+
+ Count of how many bans and objects have been tested against each
+ other during hash lookup.
+
+.. varnish_vsc:: bans_obj_killed
+ :level: diag
+ :oneliner: Objects killed by bans (lookup)
+
+ Number of objects killed by bans during object lookup.
+
+.. varnish_vsc:: bans_lurker_tested
+ :level: diag
+ :oneliner: Bans tested against objects (lurker)
+
+ Count of how many bans and objects have been tested against each
+ other by the ban-lurker.
+
+.. varnish_vsc:: bans_tests_tested
+ :level: diag
+ :oneliner: Ban tests tested against objects (lookup)
+
+ Count of how many tests and objects have been tested against each
+ other during lookup. 'ban req.url == foo && req.http.host == bar'
+ counts as one in 'bans_tested' and as two in 'bans_tests_tested'
+
+.. varnish_vsc:: bans_lurker_tests_tested
+ :level: diag
+ :oneliner: Ban tests tested against objects (lurker)
+
+ Count of how many tests and objects have been tested against each
+ other by the ban-lurker. 'ban req.url == foo && req.http.host ==
+ bar' counts as one in 'bans_tested' and as two in 'bans_tests_tested'
+
+.. varnish_vsc:: bans_lurker_obj_killed
+ :level: diag
+ :oneliner: Objects killed by bans (lurker)
+
+ Number of objects killed by the ban-lurker.
+
+.. varnish_vsc:: bans_lurker_obj_killed_cutoff
+ :level: diag
+ :oneliner: Objects killed by bans for cutoff (lurker)
+
+ Number of objects killed by the ban-lurker to keep the number of
+ bans below ban_cutoff.
+
+.. varnish_vsc:: bans_dups
+ :level: diag
+ :oneliner: Bans superseded by other bans
+
+ Count of bans replaced by later identical bans.
+
+.. varnish_vsc:: bans_lurker_contention
+ :level: diag
+ :oneliner: Lurker gave way for lookup
+
+ Number of times the ban-lurker had to wait for lookups.
+
+.. varnish_vsc:: bans_persisted_bytes
+ :type: gauge
+ :format: bytes
+ :level: diag
+ :oneliner: Bytes used by the persisted ban lists
+
+ Number of bytes used by the persisted ban lists.
+
+.. varnish_vsc:: bans_persisted_fragmentation
+ :type: gauge
+ :format: bytes
+ :level: diag
+ :oneliner: Extra bytes in persisted ban lists due to fragmentation
+
+ Number of extra bytes accumulated through dropped and completed
+ bans in the persistent ban lists.
+
+.. varnish_vsc:: n_purges
+ :type: gauge
+ :oneliner: Number of purge operations executed
+
+
+.. varnish_vsc:: n_obj_purged
+ :type: gauge
+ :oneliner: Number of purged objects
+
+
+.. varnish_vsc:: exp_mailed
+ :level: diag
+ :oneliner: Number of objects mailed to expiry thread
+
+ Number of objects mailed to expiry thread for handling.
+
+.. varnish_vsc:: exp_received
+ :level: diag
+ :oneliner: Number of objects received by expiry thread
+
+ Number of objects received by expiry thread for handling.
+
+.. varnish_vsc:: hcb_nolock
+ :level: debug
+ :oneliner: HCB Lookups without lock
+
+
+.. varnish_vsc:: hcb_lock
+ :level: debug
+ :oneliner: HCB Lookups with lock
+
+
+.. varnish_vsc:: hcb_insert
+ :level: debug
+ :oneliner: HCB Inserts
+
+
+.. varnish_vsc:: esi_errors
+ :level: diag
+ :oneliner: ESI parse errors (unlock)
+
+
+.. varnish_vsc:: esi_warnings
+ :level: diag
+ :oneliner: ESI parse warnings (unlock)
+
+
+.. varnish_vsc:: vmods
+ :type: gauge
+ :oneliner: Loaded VMODs
+
+
+.. varnish_vsc:: n_gzip
+ :oneliner: Gzip operations
+
+
+.. varnish_vsc:: n_gunzip
+ :oneliner: Gunzip operations
+
+
+.. varnish_vsc:: n_test_gunzip
+ :oneliner: Test gunzip operations
+
+ Those operations occur when Varnish receives a compressed object
+ from a backend. They are done to verify the gzip stream while it's
+ inserted in storage.
+
+.. varnish_vsc_end:: main
diff --git a/bin/varnishd/VSC_mempool.vsc b/bin/varnishd/VSC_mempool.vsc
new file mode 100644
index 0000000..8c47245
--- /dev/null
+++ b/bin/varnishd/VSC_mempool.vsc
@@ -0,0 +1,75 @@
+..
+ This is *NOT* a RST file but the syntax has been chosen so
+ that it may become an RST file at some later date.
+
+.. varnish_vsc_begin:: mempool
+ :oneliner: Memory Pool Counters
+ :order: 30
+
+.. varnish_vsc:: live
+ :type: gauge
+ :level: debug
+ :oneliner: In use
+
+
+.. varnish_vsc:: pool
+ :type: gauge
+ :level: debug
+ :oneliner: In Pool
+
+
+.. varnish_vsc:: sz_wanted
+ :type: gauge
+ :level: debug
+ :format: bytes
+ :oneliner: Size requested
+
+
+.. varnish_vsc:: sz_actual
+ :type: gauge
+ :level: debug
+ :format: bytes
+ :oneliner: Size allocated
+
+
+.. varnish_vsc:: allocs
+ :type: counter
+ :level: debug
+ :oneliner: Allocations
+
+.. varnish_vsc:: frees
+ :type: counter
+ :level: debug
+ :oneliner: Frees
+
+.. varnish_vsc:: recycle
+ :type: counter
+ :level: debug
+ :oneliner: Recycled from pool
+
+
+.. varnish_vsc:: timeout
+ :type: counter
+ :level: debug
+ :oneliner: Timed out from pool
+
+
+.. varnish_vsc:: toosmall
+ :type: counter
+ :level: debug
+ :oneliner: Too small to recycle
+
+
+.. varnish_vsc:: surplus
+ :type: counter
+ :level: debug
+ :oneliner: Too many for pool
+
+
+.. varnish_vsc:: randry
+ :type: counter
+ :level: debug
+ :oneliner: Pool ran dry
+
+
+.. varnish_vsc_end:: mempool
diff --git a/bin/varnishd/VSC_mgt.vsc b/bin/varnishd/VSC_mgt.vsc
new file mode 100644
index 0000000..c3ca867
--- /dev/null
+++ b/bin/varnishd/VSC_mgt.vsc
@@ -0,0 +1,60 @@
+..
+ This is *NOT* a RST file but the syntax has been chosen so
+ that it may become an RST file at some later date.
+
+.. varnish_vsc_begin:: mgt
+ :oneliner: Management Process Counters
+ :order: 20
+
+.. varnish_vsc:: uptime
+ :type: counter
+ :format: duration
+ :level: info
+ :oneliner: Management process uptime
+
+ Uptime in seconds of the management process
+
+.. varnish_vsc:: child_start
+ :type: counter
+ :level: diag
+ :oneliner: Child process started
+
+ Number of times the child process has been started
+
+.. varnish_vsc:: child_exit
+ :type: counter
+ :level: diag
+ :oneliner: Child process normal exit
+
+ Number of times the child process has been cleanly stopped
+
+.. varnish_vsc:: child_stop
+ :type: counter
+ :level: diag
+ :oneliner: Child process unexpected exit
+
+ Number of times the child process has exited with an
+ unexpected return code
+
+.. varnish_vsc:: child_died
+ :type: counter
+ :level: diag
+ :oneliner: Child process died (signal)
+
+ Number of times the child process has died due to signals
+
+.. varnish_vsc:: child_dump
+ :type: counter
+ :level: diag
+ :oneliner: Child process core dumped
+
+ Number of times the child process has produced core dumps
+
+.. varnish_vsc:: child_panic
+ :type: counter
+ :level: diag
+ :oneliner: Child process panic
+
+ Number of times the management process has caught a child panic
+
+.. varnish_vsc_end:: mgt
diff --git a/bin/varnishd/VSC_sma.vsc b/bin/varnishd/VSC_sma.vsc
new file mode 100644
index 0000000..d2ecc52
--- /dev/null
+++ b/bin/varnishd/VSC_sma.vsc
@@ -0,0 +1,62 @@
+..
+ This is *NOT* a RST file but the syntax has been chosen so
+ that it may become an RST file at some later date.
+
+.. varnish_vsc_begin:: sma
+ :oneliner: Malloc Stevedore Counters
+ :order: 40
+
+.. varnish_vsc:: c_req
+ :type: counter
+ :level: info
+ :oneliner: Allocator requests
+
+ Number of times the storage has been asked to provide a storage segment.
+
+.. varnish_vsc:: c_fail
+ :type: counter
+ :level: info
+ :oneliner: Allocator failures
+
+ Number of times the storage has failed to provide a storage segment.
+
+.. varnish_vsc:: c_bytes
+ :type: counter
+ :level: info
+ :format: bytes
+ :oneliner: Bytes allocated
+
+ Number of total bytes allocated by this storage.
+
+.. varnish_vsc:: c_freed
+ :type: counter
+ :level: info
+ :format: bytes
+ :oneliner: Bytes freed
+
+ Number of total bytes returned to this storage.
+
+.. varnish_vsc:: g_alloc
+ :type: gauge
+ :level: info
+ :oneliner: Allocations outstanding
+
+ Number of storage allocations outstanding.
+
+.. varnish_vsc:: g_bytes
+ :type: gauge
+ :level: info
+ :format: bytes
+ :oneliner: Bytes outstanding
+
+ Number of bytes allocated from the storage.
+
+.. varnish_vsc:: g_space
+ :type: gauge
+ :level: info
+ :format: bytes
+ :oneliner: Bytes available
+
+ Number of bytes left in the storage.
+
+.. varnish_vsc_end:: sma
diff --git a/bin/varnishd/VSC_smf.vsc b/bin/varnishd/VSC_smf.vsc
new file mode 100644
index 0000000..4ec0dcc
--- /dev/null
+++ b/bin/varnishd/VSC_smf.vsc
@@ -0,0 +1,80 @@
+..
+ This is *NOT* a RST file but the syntax has been chosen so
+ that it may become an RST file at some later date.
+
+.. varnish_vsc_begin:: smf
+ :oneliner: File Stevedore Counters
+ :order: 50
+
+.. varnish_vsc:: c_req
+ :type: counter
+ :level: info
+ :oneliner: Allocator requests
+
+ Number of times the storage has been asked to provide a storage segment.
+
+.. varnish_vsc:: c_fail
+ :type: counter
+ :level: info
+ :oneliner: Allocator failures
+
+ Number of times the storage has failed to provide a storage segment.
+
+.. varnish_vsc:: c_bytes
+ :type: counter
+ :level: info
+ :format: bytes
+ :oneliner: Bytes allocated
+
+ Number of total bytes allocated by this storage.
+
+.. varnish_vsc:: c_freed
+ :type: counter
+ :level: info
+ :format: bytes
+ :oneliner: Bytes freed
+
+ Number of total bytes returned to this storage.
+
+.. varnish_vsc:: g_alloc
+ :type: gauge
+ :level: info
+ :oneliner: Allocations outstanding
+
+ Number of storage allocations outstanding.
+
+.. varnish_vsc:: g_bytes
+ :type: gauge
+ :level: info
+ :format: bytes
+ :oneliner: Bytes outstanding
+
+ Number of bytes allocated from the storage.
+
+.. varnish_vsc:: g_space
+ :type: gauge
+ :level: info
+ :format: bytes
+ :oneliner: Bytes available
+
+ Number of bytes left in the storage.
+
+.. varnish_vsc:: g_smf
+ :type: gauge
+ :level: info
+ :oneliner: N struct smf
+
+
+.. varnish_vsc:: g_smf_frag
+ :type: gauge
+ :level: info
+ :oneliner: N small free smf
+
+
+.. varnish_vsc:: g_smf_large
+ :type: gauge
+ :level: info
+ :oneliner: N large free smf
+
+
+.. varnish_vsc_end:: smf
diff --git a/bin/varnishd/VSC_smu.vsc b/bin/varnishd/VSC_smu.vsc
new file mode 100644
index 0000000..89af32b
--- /dev/null
+++ b/bin/varnishd/VSC_smu.vsc
@@ -0,0 +1,62 @@
+..
+ This is *NOT* a RST file but the syntax has been chosen so
+ that it may become an RST file at some later date.
+
+.. varnish_vsc_begin:: smu
+ :oneliner: Umem Stevedore Counters
+ :order: 40
+
+.. varnish_vsc:: c_req
+ :type: counter
+ :level: info
+ :oneliner: Allocator requests
+
+ Number of times the storage has been asked to provide a storage segment.
+
+.. varnish_vsc:: c_fail
+ :type: counter
+ :level: info
+ :oneliner: Allocator failures
+
+ Number of times the storage has failed to provide a storage segment.
+
+.. varnish_vsc:: c_bytes
+ :type: counter
+ :level: info
+ :format: bytes
+ :oneliner: Bytes allocated
+
+ Number of total bytes allocated by this storage.
+
+.. varnish_vsc:: c_freed
+ :type: counter
+ :level: info
+ :format: bytes
+ :oneliner: Bytes freed
+
+ Number of total bytes returned to this storage.
+
+.. varnish_vsc:: g_alloc
+ :type: gauge
+ :level: info
+ :oneliner: Allocations outstanding
+
+ Number of storage allocations outstanding.
+
+.. varnish_vsc:: g_bytes
+ :type: gauge
+ :level: info
+ :format: bytes
+ :oneliner: Bytes outstanding
+
+ Number of bytes allocated from the storage.
+
+.. varnish_vsc:: g_space
+ :type: gauge
+ :level: info
+ :format: bytes
+ :oneliner: Bytes available
+
+ Number of bytes left in the storage.
+
+.. varnish_vsc_end:: smu
diff --git a/bin/varnishd/VSC_vbe.vsc b/bin/varnishd/VSC_vbe.vsc
new file mode 100644
index 0000000..c5ca37f
--- /dev/null
+++ b/bin/varnishd/VSC_vbe.vsc
@@ -0,0 +1,82 @@
+..
+ This is *NOT* a RST file but the syntax has been chosen so
+ that it may become an RST file at some later date.
+
+.. varnish_vsc_begin:: vbe
+ :oneliner: Backend Counters
+ :order: 60
+
+.. varnish_vsc:: happy
+ :type: bitmap
+ :format: bitmap
+ :level: info
+ :oneliner: Happy health probes
+
+.. varnish_vsc:: bereq_hdrbytes
+ :type: counter
+ :level: info
+ :format: bytes
+ :oneliner: Request header bytes
+
+ Total backend request header bytes sent
+
+.. varnish_vsc:: bereq_bodybytes
+ :type: counter
+ :level: info
+ :format: bytes
+ :oneliner: Request body bytes
+
+ Total backend request body bytes sent
+
+.. varnish_vsc:: beresp_hdrbytes
+ :type: counter
+ :level: info
+ :format: bytes
+ :oneliner: Response header bytes
+
+ Total backend response header bytes received
+
+.. varnish_vsc:: beresp_bodybytes
+ :type: counter
+ :level: info
+ :format: bytes
+ :oneliner: Response body bytes
+
+ Total backend response body bytes received
+
+.. varnish_vsc:: pipe_hdrbytes
+ :type: counter
+ :level: info
+ :format: bytes
+ :oneliner: Pipe request header bytes
+
+ Total request bytes sent for piped sessions
+
+.. varnish_vsc:: pipe_out
+ :type: counter
+ :level: info
+ :format: bytes
+ :oneliner: Piped bytes to backend
+
+ Total number of bytes forwarded to backend in pipe sessions
+
+.. varnish_vsc:: pipe_in
+ :type: counter
+ :level: info
+ :format: bytes
+ :oneliner: Piped bytes from backend
+
+ Total number of bytes forwarded from backend in pipe sessions
+
+.. varnish_vsc:: conn
+ :type: gauge
+ :level: info
+ :oneliner: Concurrent connections to backend
+
+.. varnish_vsc:: req
+ :type: counter
+ :level: info
+ :oneliner: Backend requests sent
+
+.. varnish_vsc_end:: vbe
+
diff --git a/bin/varnishd/lck.vsc b/bin/varnishd/lck.vsc
deleted file mode 100644
index 75b69be..0000000
--- a/bin/varnishd/lck.vsc
+++ /dev/null
@@ -1,31 +0,0 @@
-..
- This is *NOT* a RST file but the syntax has been chosen so
- that it may become an RST file at some later date.
-
-.. varnish_vsc_begin:: lck
- :oneliner: Lock Counters
- :order: 70
-
- Counters which track the activity in the different classes
- of mutex-locks.
-
-.. varnish_vsc:: creat
- :type: counter
- :level: debug
- :oneliner: Created locks
-
-
-.. varnish_vsc:: destroy
- :type: counter
- :level: debug
- :oneliner: Destroyed locks
-
-
-.. varnish_vsc:: locks
- :type: counter
- :level: debug
- :oneliner: Lock Operations
-
-
-.. varnish_vsc_end:: lck
-
diff --git a/bin/varnishd/main.vsc b/bin/varnishd/main.vsc
deleted file mode 100644
index ca999f7..0000000
--- a/bin/varnishd/main.vsc
+++ /dev/null
@@ -1,731 +0,0 @@
-..
- This is *NOT* a RST file but the syntax has been chosen so
- that it may become an RST file at some later date.
-
-.. varnish_vsc_begin:: main
- :oneliner: Main counters
- :order: 10
- :sumfunction:
-
-.. varnish_vsc:: summs
- :level: debug
- :oneliner: stat summ operations
-
-.. varnish_vsc:: uptime
- :oneliner: Child process uptime
- :format: duration
-
- How long the child process has been running.
-
-.. varnish_vsc:: sess_conn
- :oneliner: Sessions accepted
-
- Count of sessions successfully accepted
-
-.. varnish_vsc:: sess_drop
- :oneliner: Sessions dropped
-
- Count of sessions silently dropped due to lack of worker thread.
-
-.. varnish_vsc:: sess_fail
- :oneliner: 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 file
- descriptors.
-
-.. varnish_vsc:: client_req_400
- :oneliner: Client requests received, subject to 400 errors
-
- 400 means we couldn't make sense of the request, it was malformed
- in some drastic way.
-
-.. varnish_vsc:: client_req_417
- :oneliner: Client requests received, subject to 417 errors
-
- 417 means that something went wrong with an Expect: header.
-
-.. varnish_vsc:: client_req
- :oneliner: Good client requests received
-
- The count of parseable client requests seen.
-
-.. varnish_vsc:: cache_hit
- :oneliner: 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.
-
-.. varnish_vsc:: cache_hitpass
- :oneliner: 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.
-
-.. varnish_vsc:: cache_hitmiss
- :oneliner: Cache hits for miss.
-
- Count of hits for miss. A cache hit for miss indicates that Varnish
- is going to proceed as for a cache miss without request coalescing,
- and this decision has been cached. This counts how many times the
- cached decision is being used.
-
-.. varnish_vsc:: cache_miss
- :oneliner: Cache misses
-
- Count of misses. A cache miss indicates the object was fetched from
- the backend before delivering it to the client.
-
-.. varnish_vsc:: backend_conn
- :oneliner: Backend conn. success
-
- How many backend connections have successfully been established.
-
-.. varnish_vsc:: backend_unhealthy
- :oneliner: Backend conn. not attempted
-
-
-.. varnish_vsc:: backend_busy
- :oneliner: Backend conn. too many
-
-
-.. varnish_vsc:: backend_fail
- :oneliner: Backend conn. failures
-
-
-.. varnish_vsc:: backend_reuse
- :oneliner: Backend conn. reuses
-
- Count of backend connection reuses. This counter is increased
- whenever we reuse a recycled connection.
-
-.. varnish_vsc:: backend_recycle
- :oneliner: 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.
-
-.. varnish_vsc:: backend_retry
- :oneliner: Backend conn. retry
-
-
-.. varnish_vsc:: fetch_head
- :oneliner: Fetch no body (HEAD)
-
- beresp with no body because the request is HEAD.
-
-.. varnish_vsc:: fetch_length
- :oneliner: Fetch with Length
-
- beresp.body with Content-Length.
-
-.. varnish_vsc:: fetch_chunked
- :oneliner: Fetch chunked
-
- beresp.body with Chunked.
-
-.. varnish_vsc:: fetch_eof
- :oneliner: Fetch EOF
-
- beresp.body with EOF.
-
-.. varnish_vsc:: fetch_bad
- :oneliner: Fetch bad T-E
-
- beresp.body length/fetch could not be determined.
-
-.. varnish_vsc:: fetch_none
- :oneliner: Fetch no body
-
- beresp.body empty
-
-.. varnish_vsc:: fetch_1xx
- :oneliner: Fetch no body (1xx)
-
- beresp with no body because of 1XX response.
-
-.. varnish_vsc:: fetch_204
- :oneliner: Fetch no body (204)
-
- beresp with no body because of 204 response.
-
-.. varnish_vsc:: fetch_304
- :oneliner: Fetch no body (304)
-
- beresp with no body because of 304 response.
-
-.. varnish_vsc:: fetch_failed
- :oneliner: Fetch failed (all causes)
-
- beresp fetch failed.
-
-.. varnish_vsc:: fetch_no_thread
- :oneliner: Fetch failed (no thread)
-
- beresp fetch failed, no thread available.
-
-.. varnish_vsc:: pools
- :type: gauge
- :oneliner: Number of thread pools
-
- Number of thread pools. See also parameter thread_pools. NB: Presently
- pools cannot be removed once created.
-
-.. varnish_vsc:: threads
- :type: gauge
- :oneliner: Total number of threads
-
- Number of threads in all pools. See also parameters thread_pools,
- thread_pool_min and thread_pool_max.
-
-.. varnish_vsc:: threads_limited
- :oneliner: Threads hit max
-
- Number of times more threads were needed, but limit was reached in
- a thread pool. See also parameter thread_pool_max.
-
-.. varnish_vsc:: threads_created
- :oneliner: Threads created
-
- Total number of threads created in all pools.
-
-.. varnish_vsc:: threads_destroyed
- :oneliner: Threads destroyed
-
- Total number of threads destroyed in all pools.
-
-.. varnish_vsc:: threads_failed
- :oneliner: Thread creation failed
-
- Number of times creating a thread failed. See VSL::Debug for
- diagnostics. See also parameter thread_fail_delay.
-
-.. varnish_vsc:: thread_queue_len
- :type: gauge
- :oneliner: Length of session queue
-
- Length of session queue waiting for threads. NB: Only updates once
- per second. See also parameter thread_queue_limit.
-
-.. varnish_vsc:: busy_sleep
- :oneliner: Number of requests sent to sleep on busy objhdr
-
- Number of requests sent to sleep without a worker thread because
- they found a busy object.
-
-.. varnish_vsc:: busy_wakeup
- :oneliner: Number of requests woken after sleep on busy objhdr
-
- Number of requests taken off the busy object sleep list and rescheduled.
-
-.. varnish_vsc:: busy_killed
- :oneliner: Number of requests killed after sleep on busy objhdr
-
- Number of requests killed from the busy object sleep list due to
- lack of resources.
-
-.. varnish_vsc:: sess_queued
- :oneliner: Sessions queued for thread
-
- Number of times session was queued waiting for a thread. See also
- parameter thread_queue_limit.
-
-.. varnish_vsc:: sess_dropped
- :oneliner: Sessions dropped for thread
-
- Number of times an HTTP/1 session was dropped because the queue was
- too long already. See also parameter thread_queue_limit.
-
-.. varnish_vsc:: req_dropped
- :oneliner: Requests dropped
-
- Number of times an HTTP/2 stream was refused because the queue was
- too long already. See also parameter thread_queue_limit.
-
-.. varnish_vsc:: n_object
- :type: gauge
- :oneliner: object structs made
-
- Approximate number of HTTP objects (headers + body, if present) in
- the cache.
-
-.. varnish_vsc:: n_vampireobject
- :type: gauge
- :level: diag
- :oneliner: unresurrected objects
-
- Number of unresurrected objects
-
-.. varnish_vsc:: n_objectcore
- :type: gauge
- :oneliner: objectcore structs made
-
- Approximate number of object metadata elements in the cache. Each
- object needs an objectcore, extra objectcores are for hit-for-miss,
- hit-for-pass and busy objects.
-
-.. varnish_vsc:: n_objecthead
- :type: gauge
- :oneliner: objecthead structs made
-
- Approximate number of different hash entries in the cache.
-
-.. varnish_vsc:: n_backend
- :type: gauge
- :oneliner: Number of backends
-
- Number of backends known to us.
-
-.. varnish_vsc:: n_expired
- :type: gauge
- :oneliner: Number of expired objects
-
- Number of objects that expired from cache because of old age.
-
-.. varnish_vsc:: n_lru_nuked
- :type: gauge
- :oneliner: Number of LRU nuked objects
-
- How many objects have been forcefully evicted from storage to make
- room for a new object.
-
-.. varnish_vsc:: n_lru_moved
- :type: gauge
- :level: diag
- :oneliner: Number of LRU moved objects
-
- Number of move operations done on the LRU list.
-
-.. varnish_vsc:: losthdr
- :oneliner: HTTP header overflows
-
-
-.. varnish_vsc:: s_sess
- :oneliner: Total sessions seen
-
-
-.. varnish_vsc:: s_pipe
- :oneliner: Total pipe sessions seen
-
-
-.. varnish_vsc:: s_pass
- :oneliner: Total pass-ed requests seen
-
-
-.. varnish_vsc:: s_fetch
- :oneliner: Total backend fetches initiated
-
-
-.. varnish_vsc:: s_synth
- :oneliner: Total synthethic responses made
-
-
-.. varnish_vsc:: s_req_hdrbytes
- :oneliner: Request header bytes
- :format: bytes
-
- Total request header bytes received
-
-.. varnish_vsc:: s_req_bodybytes
- :oneliner: Request body bytes
- :format: bytes
-
- Total request body bytes received
-
-.. varnish_vsc:: s_resp_hdrbytes
- :oneliner: Response header bytes
- :format: bytes
-
- Total response header bytes transmitted
-
-.. varnish_vsc:: s_resp_bodybytes
- :oneliner: Response body bytes
- :format: bytes
-
- Total response body bytes transmitted
- :format: bytes
-
-.. varnish_vsc:: s_pipe_hdrbytes
- :oneliner: Pipe request header bytes
- :format: bytes
-
- Total request bytes received for piped sessions
-
-.. varnish_vsc:: s_pipe_in
- :oneliner: Piped bytes from client
- :format: bytes
-
- Total number of bytes forwarded from clients in pipe sessions
-
-.. varnish_vsc:: s_pipe_out
- :oneliner: Piped bytes to client
- :format: bytes
-
- Total number of bytes forwarded to clients in pipe sessions
-
-.. varnish_vsc:: sess_closed
- :oneliner: Session Closed
-
-
-.. varnish_vsc:: sess_closed_err
- :oneliner: Session Closed with error
-
- Total number of sessions closed with errors. See sc_* diag counters
- for detailed breakdown
-
-.. varnish_vsc:: sess_readahead
- :oneliner: Session Read Ahead
-
-
-.. varnish_vsc:: sess_herd
- :level: diag
- :oneliner: Session herd
-
- Number of times the timeout_linger triggered
-
-.. varnish_vsc:: sc_rem_close
- :level: diag
- :oneliner: Session OK REM_CLOSE
-
- Number of session closes with REM_CLOSE (Client Closed)
-
-.. varnish_vsc:: sc_req_close
- :level: diag
- :oneliner: Session OK REQ_CLOSE
-
- Number of session closes with REQ_CLOSE (Client requested close)
-
-.. varnish_vsc:: sc_req_http10
- :level: diag
- :oneliner: Session Err REQ_HTTP10
-
- Number of session closes with Error REQ_HTTP10 (Proto < HTTP/1.1)
-
-.. varnish_vsc:: sc_rx_bad
- :level: diag
- :oneliner: Session Err RX_BAD
-
- Number of session closes with Error RX_BAD (Received bad req/resp)
-
-.. varnish_vsc:: sc_rx_body
- :level: diag
- :oneliner: Session Err RX_BODY
-
- Number of session closes with Error RX_BODY (Failure receiving req.body)
-
-.. varnish_vsc:: sc_rx_junk
- :level: diag
- :oneliner: Session Err RX_JUNK
-
- Number of session closes with Error RX_JUNK (Received junk data)
-
-.. varnish_vsc:: sc_rx_overflow
- :level: diag
- :oneliner: Session Err RX_OVERFLOW
-
- Number of session closes with Error RX_OVERFLOW (Received buffer overflow)
-
-.. varnish_vsc:: sc_rx_timeout
- :level: diag
- :oneliner: Session Err RX_TIMEOUT
-
- Number of session closes with Error RX_TIMEOUT (Receive timeout)
-
-.. varnish_vsc:: sc_tx_pipe
- :level: diag
- :oneliner: Session OK TX_PIPE
-
- Number of session closes with TX_PIPE (Piped transaction)
-
-.. varnish_vsc:: sc_tx_error
- :level: diag
- :oneliner: Session Err TX_ERROR
-
- Number of session closes with Error TX_ERROR (Error transaction)
-
-.. varnish_vsc:: sc_tx_eof
- :level: diag
- :oneliner: Session OK TX_EOF
-
- Number of session closes with TX_EOF (EOF transmission)
-
-.. varnish_vsc:: sc_resp_close
- :level: diag
- :oneliner: Session OK RESP_CLOSE
-
- Number of session closes with RESP_CLOSE (Backend/VCL requested close)
-
-.. varnish_vsc:: sc_overload
- :level: diag
- :oneliner: Session Err OVERLOAD
-
- Number of session closes with Error OVERLOAD (Out of some resource)
-
-.. varnish_vsc:: sc_pipe_overflow
- :level: diag
- :oneliner: Session Err PIPE_OVERFLOW
-
- Number of session closes with Error PIPE_OVERFLOW (Session pipe overflow)
-
-.. varnish_vsc:: sc_range_short
- :level: diag
- :oneliner: Session Err RANGE_SHORT
-
- Number of session closes with Error RANGE_SHORT (Insufficient data for range)
-
-.. varnish_vsc:: sc_req_http20
- :level: diag
- :oneliner: Session Err REQ_HTTP20
-
- Number of session closes with Error REQ_HTTP20 (HTTP2 not accepted)
-
-.. varnish_vsc:: sc_vcl_failure
- :level: diag
- :oneliner: Session Err VCL_FAILURE
-
- Number of session closes with Error VCL_FAILURE (VCL failure)
-
-.. varnish_vsc:: shm_records
- :level: diag
- :oneliner: SHM records
-
-
-.. varnish_vsc:: shm_writes
- :level: diag
- :oneliner: SHM writes
-
-
-.. varnish_vsc:: shm_flushes
- :level: diag
- :oneliner: SHM flushes due to overflow
-
-
-.. varnish_vsc:: shm_cont
- :level: diag
- :oneliner: SHM MTX contention
-
-
-.. varnish_vsc:: shm_cycles
- :level: diag
- :oneliner: SHM cycles through buffer
-
-
-.. varnish_vsc:: backend_req
- :oneliner: Backend requests made
-
-
-.. varnish_vsc:: n_vcl
- :type: gauge
- :oneliner: Number of loaded VCLs in total
-
-
-.. varnish_vsc:: n_vcl_avail
- :type: gauge
- :level: diag
- :oneliner: Number of VCLs available
-
-
-.. varnish_vsc:: n_vcl_discard
- :type: gauge
- :level: diag
- :oneliner: Number of discarded VCLs
-
-
-.. varnish_vsc:: vcl_fail
- :oneliner: VCL failures
-
- Count of failures which prevented VCL from completing.
-
-.. varnish_vsc:: bans
- :type: gauge
- :oneliner: Count of bans
-
- Number of all bans in system, including bans superseded by newer
- bans and bans already checked by the ban-lurker.
-
-.. varnish_vsc:: bans_completed
- :type: gauge
- :level: diag
- :oneliner: Number of bans marked 'completed'
-
- Number of bans which are no longer active, either because they got
- checked by the ban-lurker or superseded by newer identical bans.
-
-.. varnish_vsc:: bans_obj
- :type: gauge
- :level: diag
- :oneliner: Number of bans using obj.*
-
- Number of bans which use obj.* variables. These bans can possibly
- be washed by the ban-lurker.
-
-.. varnish_vsc:: bans_req
- :type: gauge
- :level: diag
- :oneliner: Number of bans using req.*
-
- Number of bans which use req.* variables. These bans can not be
- washed by the ban-lurker.
-
-.. varnish_vsc:: bans_added
- :level: diag
- :oneliner: Bans added
-
- Counter of bans added to ban list.
-
-.. varnish_vsc:: bans_deleted
- :level: diag
- :oneliner: Bans deleted
-
- Counter of bans deleted from ban list.
-
-.. varnish_vsc:: bans_tested
- :level: diag
- :oneliner: Bans tested against objects (lookup)
-
- Count of how many bans and objects have been tested against each
- other during hash lookup.
-
-.. varnish_vsc:: bans_obj_killed
- :level: diag
- :oneliner: Objects killed by bans (lookup)
-
- Number of objects killed by bans during object lookup.
-
-.. varnish_vsc:: bans_lurker_tested
- :level: diag
- :oneliner: Bans tested against objects (lurker)
-
- Count of how many bans and objects have been tested against each
- other by the ban-lurker.
-
-.. varnish_vsc:: bans_tests_tested
- :level: diag
- :oneliner: Ban tests tested against objects (lookup)
-
- Count of how many tests and objects have been tested against each
- other during lookup. 'ban req.url == foo && req.http.host == bar'
- counts as one in 'bans_tested' and as two in 'bans_tests_tested'
-
-.. varnish_vsc:: bans_lurker_tests_tested
- :level: diag
- :oneliner: Ban tests tested against objects (lurker)
-
- Count of how many tests and objects have been tested against each
- other by the ban-lurker. 'ban req.url == foo && req.http.host ==
- bar' counts as one in 'bans_tested' and as two in 'bans_tests_tested'
-
-.. varnish_vsc:: bans_lurker_obj_killed
- :level: diag
- :oneliner: Objects killed by bans (lurker)
-
- Number of objects killed by the ban-lurker.
-
-.. varnish_vsc:: bans_lurker_obj_killed_cutoff
- :level: diag
- :oneliner: Objects killed by bans for cutoff (lurker)
-
- Number of objects killed by the ban-lurker to keep the number of
- bans below ban_cutoff.
-
-.. varnish_vsc:: bans_dups
- :level: diag
- :oneliner: Bans superseded by other bans
-
- Count of bans replaced by later identical bans.
-
-.. varnish_vsc:: bans_lurker_contention
- :level: diag
- :oneliner: Lurker gave way for lookup
-
- Number of times the ban-lurker had to wait for lookups.
-
-.. varnish_vsc:: bans_persisted_bytes
- :type: gauge
- :format: bytes
- :level: diag
- :oneliner: Bytes used by the persisted ban lists
-
- Number of bytes used by the persisted ban lists.
-
-.. varnish_vsc:: bans_persisted_fragmentation
- :type: gauge
- :format: bytes
- :level: diag
- :oneliner: Extra bytes in persisted ban lists due to fragmentation
-
- Number of extra bytes accumulated through dropped and completed
- bans in the persistent ban lists.
-
-.. varnish_vsc:: n_purges
- :type: gauge
- :oneliner: Number of purge operations executed
-
-
-.. varnish_vsc:: n_obj_purged
- :type: gauge
- :oneliner: Number of purged objects
-
-
-.. varnish_vsc:: exp_mailed
- :level: diag
- :oneliner: Number of objects mailed to expiry thread
-
- Number of objects mailed to expiry thread for handling.
-
-.. varnish_vsc:: exp_received
- :level: diag
- :oneliner: Number of objects received by expiry thread
-
- Number of objects received by expiry thread for handling.
-
-.. varnish_vsc:: hcb_nolock
- :level: debug
- :oneliner: HCB Lookups without lock
-
-
-.. varnish_vsc:: hcb_lock
- :level: debug
- :oneliner: HCB Lookups with lock
-
-
-.. varnish_vsc:: hcb_insert
- :level: debug
- :oneliner: HCB Inserts
-
-
-.. varnish_vsc:: esi_errors
- :level: diag
- :oneliner: ESI parse errors (unlock)
-
-
-.. varnish_vsc:: esi_warnings
- :level: diag
- :oneliner: ESI parse warnings (unlock)
-
-
-.. varnish_vsc:: vmods
- :type: gauge
- :oneliner: Loaded VMODs
-
-
-.. varnish_vsc:: n_gzip
- :oneliner: Gzip operations
-
-
-.. varnish_vsc:: n_gunzip
- :oneliner: Gunzip operations
-
-
-.. varnish_vsc:: n_test_gunzip
- :oneliner: Test gunzip operations
-
- Those operations occur when Varnish receives a compressed object
- from a backend. They are done to verify the gzip stream while it's
- inserted in storage.
-
-.. varnish_vsc_end:: main
diff --git a/bin/varnishd/mempool.vsc b/bin/varnishd/mempool.vsc
deleted file mode 100644
index 8c47245..0000000
--- a/bin/varnishd/mempool.vsc
+++ /dev/null
@@ -1,75 +0,0 @@
-..
- This is *NOT* a RST file but the syntax has been chosen so
- that it may become an RST file at some later date.
-
-.. varnish_vsc_begin:: mempool
- :oneliner: Memory Pool Counters
- :order: 30
-
-.. varnish_vsc:: live
- :type: gauge
- :level: debug
- :oneliner: In use
-
-
-.. varnish_vsc:: pool
- :type: gauge
- :level: debug
- :oneliner: In Pool
-
-
-.. varnish_vsc:: sz_wanted
- :type: gauge
- :level: debug
- :format: bytes
- :oneliner: Size requested
-
-
-.. varnish_vsc:: sz_actual
- :type: gauge
- :level: debug
- :format: bytes
- :oneliner: Size allocated
-
-
-.. varnish_vsc:: allocs
- :type: counter
- :level: debug
- :oneliner: Allocations
-
-.. varnish_vsc:: frees
- :type: counter
- :level: debug
- :oneliner: Frees
-
-.. varnish_vsc:: recycle
- :type: counter
- :level: debug
- :oneliner: Recycled from pool
-
-
-.. varnish_vsc:: timeout
- :type: counter
- :level: debug
- :oneliner: Timed out from pool
-
-
-.. varnish_vsc:: toosmall
- :type: counter
- :level: debug
- :oneliner: Too small to recycle
-
-
-.. varnish_vsc:: surplus
- :type: counter
- :level: debug
- :oneliner: Too many for pool
-
-
-.. varnish_vsc:: randry
- :type: counter
- :level: debug
- :oneliner: Pool ran dry
-
-
-.. varnish_vsc_end:: mempool
diff --git a/bin/varnishd/mgt.vsc b/bin/varnishd/mgt.vsc
deleted file mode 100644
index c3ca867..0000000
--- a/bin/varnishd/mgt.vsc
+++ /dev/null
@@ -1,60 +0,0 @@
-..
- This is *NOT* a RST file but the syntax has been chosen so
- that it may become an RST file at some later date.
-
-.. varnish_vsc_begin:: mgt
- :oneliner: Management Process Counters
- :order: 20
-
-.. varnish_vsc:: uptime
- :type: counter
- :format: duration
- :level: info
- :oneliner: Management process uptime
-
- Uptime in seconds of the management process
-
-.. varnish_vsc:: child_start
- :type: counter
- :level: diag
- :oneliner: Child process started
-
- Number of times the child process has been started
-
-.. varnish_vsc:: child_exit
- :type: counter
- :level: diag
- :oneliner: Child process normal exit
-
- Number of times the child process has been cleanly stopped
-
-.. varnish_vsc:: child_stop
- :type: counter
- :level: diag
- :oneliner: Child process unexpected exit
-
- Number of times the child process has exited with an
- unexpected return code
-
-.. varnish_vsc:: child_died
- :type: counter
- :level: diag
- :oneliner: Child process died (signal)
-
- Number of times the child process has died due to signals
-
-.. varnish_vsc:: child_dump
- :type: counter
- :level: diag
- :oneliner: Child process core dumped
-
- Number of times the child process has produced core dumps
-
-.. varnish_vsc:: child_panic
- :type: counter
- :level: diag
- :oneliner: Child process panic
-
- Number of times the management process has caught a child panic
-
-.. varnish_vsc_end:: mgt
diff --git a/bin/varnishd/sma.vsc b/bin/varnishd/sma.vsc
deleted file mode 100644
index d2ecc52..0000000
--- a/bin/varnishd/sma.vsc
+++ /dev/null
@@ -1,62 +0,0 @@
-..
- This is *NOT* a RST file but the syntax has been chosen so
- that it may become an RST file at some later date.
-
-.. varnish_vsc_begin:: sma
- :oneliner: Malloc Stevedore Counters
- :order: 40
-
-.. varnish_vsc:: c_req
- :type: counter
- :level: info
- :oneliner: Allocator requests
-
- Number of times the storage has been asked to provide a storage segment.
-
-.. varnish_vsc:: c_fail
- :type: counter
- :level: info
- :oneliner: Allocator failures
-
- Number of times the storage has failed to provide a storage segment.
-
-.. varnish_vsc:: c_bytes
- :type: counter
- :level: info
- :format: bytes
- :oneliner: Bytes allocated
-
- Number of total bytes allocated by this storage.
-
-.. varnish_vsc:: c_freed
- :type: counter
- :level: info
- :format: bytes
- :oneliner: Bytes freed
-
- Number of total bytes returned to this storage.
-
-.. varnish_vsc:: g_alloc
- :type: gauge
- :level: info
- :oneliner: Allocations outstanding
-
- Number of storage allocations outstanding.
-
-.. varnish_vsc:: g_bytes
- :type: gauge
- :level: info
- :format: bytes
- :oneliner: Bytes outstanding
-
- Number of bytes allocated from the storage.
-
-.. varnish_vsc:: g_space
- :type: gauge
- :level: info
- :format: bytes
- :oneliner: Bytes available
-
- Number of bytes left in the storage.
-
-.. varnish_vsc_end:: sma
diff --git a/bin/varnishd/smf.vsc b/bin/varnishd/smf.vsc
deleted file mode 100644
index 4ec0dcc..0000000
--- a/bin/varnishd/smf.vsc
+++ /dev/null
@@ -1,80 +0,0 @@
-..
- This is *NOT* a RST file but the syntax has been chosen so
- that it may become an RST file at some later date.
-
-.. varnish_vsc_begin:: smf
- :oneliner: File Stevedore Counters
- :order: 50
-
-.. varnish_vsc:: c_req
- :type: counter
- :level: info
- :oneliner: Allocator requests
-
- Number of times the storage has been asked to provide a storage segment.
-
-.. varnish_vsc:: c_fail
- :type: counter
- :level: info
- :oneliner: Allocator failures
-
- Number of times the storage has failed to provide a storage segment.
-
-.. varnish_vsc:: c_bytes
- :type: counter
- :level: info
- :format: bytes
- :oneliner: Bytes allocated
-
- Number of total bytes allocated by this storage.
-
-.. varnish_vsc:: c_freed
- :type: counter
- :level: info
- :format: bytes
- :oneliner: Bytes freed
-
- Number of total bytes returned to this storage.
-
-.. varnish_vsc:: g_alloc
- :type: gauge
- :level: info
- :oneliner: Allocations outstanding
-
- Number of storage allocations outstanding.
-
-.. varnish_vsc:: g_bytes
- :type: gauge
- :level: info
- :format: bytes
- :oneliner: Bytes outstanding
-
- Number of bytes allocated from the storage.
-
-.. varnish_vsc:: g_space
- :type: gauge
- :level: info
- :format: bytes
- :oneliner: Bytes available
-
- Number of bytes left in the storage.
-
-.. varnish_vsc:: g_smf
- :type: gauge
- :level: info
- :oneliner: N struct smf
-
-
-.. varnish_vsc:: g_smf_frag
- :type: gauge
- :level: info
- :oneliner: N small free smf
-
-
-.. varnish_vsc:: g_smf_large
- :type: gauge
- :level: info
- :oneliner: N large free smf
-
-
-.. varnish_vsc_end:: smf
diff --git a/bin/varnishd/smu.vsc b/bin/varnishd/smu.vsc
deleted file mode 100644
index 89af32b..0000000
--- a/bin/varnishd/smu.vsc
+++ /dev/null
@@ -1,62 +0,0 @@
-..
- This is *NOT* a RST file but the syntax has been chosen so
- that it may become an RST file at some later date.
-
-.. varnish_vsc_begin:: smu
- :oneliner: Umem Stevedore Counters
- :order: 40
-
-.. varnish_vsc:: c_req
- :type: counter
- :level: info
- :oneliner: Allocator requests
-
- Number of times the storage has been asked to provide a storage segment.
-
-.. varnish_vsc:: c_fail
- :type: counter
- :level: info
- :oneliner: Allocator failures
-
- Number of times the storage has failed to provide a storage segment.
-
-.. varnish_vsc:: c_bytes
- :type: counter
- :level: info
- :format: bytes
- :oneliner: Bytes allocated
-
- Number of total bytes allocated by this storage.
-
-.. varnish_vsc:: c_freed
- :type: counter
- :level: info
- :format: bytes
- :oneliner: Bytes freed
-
- Number of total bytes returned to this storage.
-
-.. varnish_vsc:: g_alloc
- :type: gauge
- :level: info
- :oneliner: Allocations outstanding
-
- Number of storage allocations outstanding.
-
-.. varnish_vsc:: g_bytes
- :type: gauge
- :level: info
- :format: bytes
- :oneliner: Bytes outstanding
-
- Number of bytes allocated from the storage.
-
-.. varnish_vsc:: g_space
- :type: gauge
- :level: info
- :format: bytes
- :oneliner: Bytes available
-
- Number of bytes left in the storage.
-
-.. varnish_vsc_end:: smu
diff --git a/bin/varnishd/vbe.vsc b/bin/varnishd/vbe.vsc
deleted file mode 100644
index c5ca37f..0000000
--- a/bin/varnishd/vbe.vsc
+++ /dev/null
@@ -1,82 +0,0 @@
-..
- This is *NOT* a RST file but the syntax has been chosen so
- that it may become an RST file at some later date.
-
-.. varnish_vsc_begin:: vbe
- :oneliner: Backend Counters
- :order: 60
-
-.. varnish_vsc:: happy
- :type: bitmap
- :format: bitmap
- :level: info
- :oneliner: Happy health probes
-
-.. varnish_vsc:: bereq_hdrbytes
- :type: counter
- :level: info
- :format: bytes
- :oneliner: Request header bytes
-
- Total backend request header bytes sent
-
-.. varnish_vsc:: bereq_bodybytes
- :type: counter
- :level: info
- :format: bytes
- :oneliner: Request body bytes
-
- Total backend request body bytes sent
-
-.. varnish_vsc:: beresp_hdrbytes
- :type: counter
- :level: info
- :format: bytes
- :oneliner: Response header bytes
-
- Total backend response header bytes received
-
-.. varnish_vsc:: beresp_bodybytes
- :type: counter
- :level: info
- :format: bytes
- :oneliner: Response body bytes
-
- Total backend response body bytes received
-
-.. varnish_vsc:: pipe_hdrbytes
- :type: counter
- :level: info
- :format: bytes
- :oneliner: Pipe request header bytes
-
- Total request bytes sent for piped sessions
-
-.. varnish_vsc:: pipe_out
- :type: counter
- :level: info
- :format: bytes
- :oneliner: Piped bytes to backend
-
- Total number of bytes forwarded to backend in pipe sessions
-
-.. varnish_vsc:: pipe_in
- :type: counter
- :level: info
- :format: bytes
- :oneliner: Piped bytes from backend
-
- Total number of bytes forwarded from backend in pipe sessions
-
-.. varnish_vsc:: conn
- :type: gauge
- :level: info
- :oneliner: Concurrent connections to backend
-
-.. varnish_vsc:: req
- :type: counter
- :level: info
- :oneliner: Backend requests sent
-
-.. varnish_vsc_end:: vbe
-
diff --git a/configure.ac b/configure.ac
index cf8f9b5..a6081a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -688,6 +688,14 @@ AC_DEFINE_UNQUOTED([VCC_CC],"$VCC_CC",[C compiler command line for VCL code])
VTC_TESTS="$(cd $srcdir/bin/varnishtest && echo tests/*.vtc)"
AC_SUBST(VTC_TESTS)
+VSC_SRC="$(cd $srcdir/bin/varnishd && echo *.vsc)"
+VSC_GEN_C="$(echo $VSC_SRC | sed 's:\.vsc:.c:g')"
+VSC_GEN_H="$(echo $VSC_SRC | sed 's:\.vsc:.h:g')"
+# automake does not allow to AC_SUBST _SOURCES files (for a good
+# reason), so we automate the cleanup at least
+AC_SUBST(VSC_GEN_C)
+AC_SUBST(VSC_GEN_H)
+
# Make sure this include dir exists
AC_CONFIG_COMMANDS([mkdir], [$MKDIR_P doc/sphinx/include])
diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index 3c3142f..490ee50 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -124,14 +124,14 @@ include/params.rst: $(top_builddir)/bin/varnishd/varnishd
BUILT_SOURCES += include/params.rst
COUNTERS = \
- $(top_srcdir)/bin/varnishd/main.vsc \
- $(top_srcdir)/bin/varnishd/mgt.vsc \
- $(top_srcdir)/bin/varnishd/mempool.vsc \
- $(top_srcdir)/bin/varnishd/sma.vsc \
- $(top_srcdir)/bin/varnishd/smu.vsc \
- $(top_srcdir)/bin/varnishd/smf.vsc \
- $(top_srcdir)/bin/varnishd/vbe.vsc \
- $(top_srcdir)/bin/varnishd/lck.vsc
+ $(top_srcdir)/bin/varnishd/VSC_main.vsc \
+ $(top_srcdir)/bin/varnishd/VSC_mgt.vsc \
+ $(top_srcdir)/bin/varnishd/VSC_mempool.vsc \
+ $(top_srcdir)/bin/varnishd/VSC_sma.vsc \
+ $(top_srcdir)/bin/varnishd/VSC_smu.vsc \
+ $(top_srcdir)/bin/varnishd/VSC_smf.vsc \
+ $(top_srcdir)/bin/varnishd/VSC_vbe.vsc \
+ $(top_srcdir)/bin/varnishd/VSC_lck.vsc
include/counters.rst: $(top_srcdir)/lib/libvcc/vsctool.py $(COUNTERS)
echo -n '' > $@
More information about the varnish-commit
mailing list