[experimental-ims] 28026e2 Merge master -> experimental-ims

[Geoff Simmons]

commit 28026e2befb7a5de4046bf2dd12269fd3132d3f2
Merge: ee03e4a a434ce4
Author: Geoff Simmons <geoff at uplex.de>
Date:   Tue Feb 14 18:29:26 2012 +0100

    Merge master -> experimental-ims

diff --cc include/tbl/vsc_f_main.h
index 4c795e3,36bb629..e8593f0
--- a/include/tbl/vsc_f_main.h
+++ b/include/tbl/vsc_f_main.h
@@@ -82,69 -82,119 +82,123 @@@ VSC_F(sess_fail,		uint64_t, 1, 'c'
  /*---------------------------------------------------------------------*/
  
  VSC_F(client_req,		uint64_t, 1, 'a',
-       "Client requests received",
-       "")
+     "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."
+     "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_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.")
+     "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_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", "")
+     "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)", "")
- VSC_F(fetch_not_validated,	uint64_t, 1, 'c', "Non-validating responses",
-       "Count of backend responses to conditional requests with status != 304")
+     "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)",
+ 	""
+ )
++VSC_F(fetch_not_validated,	uint64_t, 1, 'c',
++    "Non-validating responses",
++        "Count of backend responses to conditional requests with status != 304"
++)
  
  /*---------------------------------------------------------------------
   * Pools, threads, and sessions