[master] ca16533 Change presentation from 'i' (integer) to 'B' (bytes) for VSM counters representing bytes.
Martin Blix Grydeland
martin at varnish-software.com
Tue Jan 27 17:17:56 CET 2015
commit ca16533cc4a6f346e4e96efbe4630f8c9322b4c8
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date: Mon Jan 19 11:39:50 2015 +0100
Change presentation from 'i' (integer) to 'B' (bytes) for VSM counters
representing bytes.
Fixes: #1653
diff --git a/include/tbl/vsc_f_main.h b/include/tbl/vsc_f_main.h
index 6bd68c1..c40867c 100644
--- a/include/tbl/vsc_f_main.h
+++ b/include/tbl/vsc_f_main.h
@@ -353,32 +353,32 @@ VSC_F(s_synth, uint64_t, 1, 'c', 'i', info,
"Total synthethic responses made",
""
)
-VSC_F(s_req_hdrbytes, uint64_t, 1, 'c', 'i', info,
+VSC_F(s_req_hdrbytes, uint64_t, 1, 'c', 'B', info,
"Request header bytes",
"Total request header bytes received"
)
-VSC_F(s_req_bodybytes, uint64_t, 1, 'c', 'i', info,
+VSC_F(s_req_bodybytes, uint64_t, 1, 'c', 'B', info,
"Request body bytes",
"Total request body bytes received"
)
-VSC_F(s_resp_hdrbytes, uint64_t, 1, 'c', 'i', info,
+VSC_F(s_resp_hdrbytes, uint64_t, 1, 'c', 'B', info,
"Response header bytes",
"Total response header bytes transmitted"
)
-VSC_F(s_resp_bodybytes, uint64_t, 1, 'c', 'i', info,
+VSC_F(s_resp_bodybytes, uint64_t, 1, 'c', 'B', info,
"Response body bytes",
"Total response body bytes transmitted"
)
-VSC_F(s_pipe_hdrbytes, uint64_t, 0, 'c', 'i', info,
+VSC_F(s_pipe_hdrbytes, uint64_t, 0, 'c', 'B', info,
"Pipe request header bytes",
"Total request bytes received for piped sessions"
)
-VSC_F(s_pipe_in, uint64_t, 0, 'c', 'i', info,
+VSC_F(s_pipe_in, uint64_t, 0, 'c', 'B', info,
"Piped bytes from client",
"Total number of bytes forwarded from clients in"
" pipe sessions"
)
-VSC_F(s_pipe_out, uint64_t, 0, 'c', 'i', info,
+VSC_F(s_pipe_out, uint64_t, 0, 'c', 'B', info,
"Piped bytes to client",
"Total number of bytes forwarded to clients in"
" pipe sessions"
@@ -517,11 +517,11 @@ VSC_F(bans_lurker_contention, uint64_t, 0, 'c', 'i', diag,
"Lurker gave way for lookup",
"Number of times the ban-lurker had to wait for lookups."
)
-VSC_F(bans_persisted_bytes, uint64_t, 0, 'g', 'i', diag,
+VSC_F(bans_persisted_bytes, uint64_t, 0, 'g', 'B', diag,
"Bytes used by the persisted ban lists",
"Number of bytes used by the persisted ban lists."
)
-VSC_F(bans_persisted_fragmentation, uint64_t, 0, 'g', 'i', diag,
+VSC_F(bans_persisted_fragmentation, uint64_t, 0, 'g', 'B', diag,
"Extra bytes in persisted ban lists due to fragmentation",
"Number of extra bytes accumulated through dropped and"
" completed bans in the persistent ban lists."
@@ -596,33 +596,33 @@ VSC_F(n_gunzip, uint64_t, 0, 'c', 'i', info,
/*--------------------------------------------------------------------*/
-VSC_F(vsm_free, uint64_t, 0, 'g', 'i', diag,
+VSC_F(vsm_free, uint64_t, 0, 'g', 'B', diag,
"Free VSM space",
"Number of bytes free in the shared memory used to communicate"
" with tools like varnishstat, varnishlog etc."
)
-VSC_F(vsm_used, uint64_t, 0, 'g', 'i', diag,
+VSC_F(vsm_used, uint64_t, 0, 'g', 'B', diag,
"Used VSM space",
"Number of bytes used in the shared memory used to communicate"
" with tools like varnishstat, varnishlog etc."
)
-VSC_F(vsm_cooling, uint64_t, 0, 'g', 'i', debug,
+VSC_F(vsm_cooling, uint64_t, 0, 'g', 'B', debug,
"Cooling VSM space",
"Number of bytes which will soon (max 1 minute) be freed"
" in the shared memory used to communicate"
" with tools like varnishstat, varnishlog etc."
)
-VSC_F(vsm_overflow, uint64_t, 0, 'g', 'i', diag,
+VSC_F(vsm_overflow, uint64_t, 0, 'g', 'B', diag,
"Overflow VSM space",
"Number of bytes which does not fit"
" in the shared memory used to communicate"
" with tools like varnishstat, varnishlog etc."
)
-VSC_F(vsm_overflowed, uint64_t, 0, 'c', 'i', diag,
+VSC_F(vsm_overflowed, uint64_t, 0, 'c', 'B', diag,
"Overflowed VSM space",
"Total number of bytes which did not fit"
" in the shared memory used to communicate"
diff --git a/include/tbl/vsc_fields.h b/include/tbl/vsc_fields.h
index 0cdb51f..1a7dfd8 100644
--- a/include/tbl/vsc_fields.h
+++ b/include/tbl/vsc_fields.h
@@ -128,11 +128,11 @@ VSC_F(c_fail, uint64_t, 0, 'c', 'i', info,
"Allocator failures",
""
)
-VSC_F(c_bytes, uint64_t, 0, 'c', 'i', info,
+VSC_F(c_bytes, uint64_t, 0, 'c', 'B', info,
"Bytes allocated",
""
)
-VSC_F(c_freed, uint64_t, 0, 'c', 'i', info,
+VSC_F(c_freed, uint64_t, 0, 'c', 'B', info,
"Bytes freed",
""
)
@@ -140,11 +140,11 @@ VSC_F(g_alloc, uint64_t, 0, 'g', 'i', info,
"Allocations outstanding",
""
)
-VSC_F(g_bytes, uint64_t, 0, 'g', 'i', info,
+VSC_F(g_bytes, uint64_t, 0, 'g', 'B', info,
"Bytes outstanding",
""
)
-VSC_F(g_space, uint64_t, 0, 'g', 'i', info,
+VSC_F(g_space, uint64_t, 0, 'g', 'B', info,
"Bytes available",
""
)
@@ -186,32 +186,32 @@ VSC_F(happy, uint64_t, 0, 'b', 'b', info,
"Happy health probes",
""
)
-VSC_F(bereq_hdrbytes, uint64_t, 0, 'c', 'i', info,
+VSC_F(bereq_hdrbytes, uint64_t, 0, 'c', 'B', info,
"Request header bytes",
"Total backend request header bytes sent"
)
-VSC_F(bereq_bodybytes, uint64_t, 0, 'c', 'i', info,
+VSC_F(bereq_bodybytes, uint64_t, 0, 'c', 'B', info,
"Request body bytes",
"Total backend request body bytes sent"
)
-VSC_F(beresp_hdrbytes, uint64_t, 0, 'c', 'i', info,
+VSC_F(beresp_hdrbytes, uint64_t, 0, 'c', 'B', info,
"Response header bytes",
"Total backend response header bytes received"
)
-VSC_F(beresp_bodybytes, uint64_t, 0, 'c', 'i', info,
+VSC_F(beresp_bodybytes, uint64_t, 0, 'c', 'B', info,
"Response body bytes",
"Total backend response body bytes received"
)
-VSC_F(pipe_hdrbytes, uint64_t, 0, 'c', 'i', info,
+VSC_F(pipe_hdrbytes, uint64_t, 0, 'c', 'B', info,
"Pipe request header bytes",
"Total request bytes sent for piped sessions"
)
-VSC_F(pipe_out, uint64_t, 0, 'c', 'i', info,
+VSC_F(pipe_out, uint64_t, 0, 'c', 'B', info,
"Piped bytes to backend",
"Total number of bytes forwarded to backend in"
" pipe sessions"
)
-VSC_F(pipe_in, uint64_t, 0, 'c', 'i', info,
+VSC_F(pipe_in, uint64_t, 0, 'c', 'B', info,
"Piped bytes from backend",
"Total number of bytes forwarded from backend in"
" pipe sessions"
@@ -238,11 +238,11 @@ VSC_F(pool, uint64_t, 0, 'g', 'i', debug,
"In Pool",
""
)
-VSC_F(sz_wanted, uint64_t, 0, 'g', 'i', debug,
+VSC_F(sz_wanted, uint64_t, 0, 'g', 'B', debug,
"Size requested",
""
)
-VSC_F(sz_needed, uint64_t, 0, 'g', 'i', debug,
+VSC_F(sz_needed, uint64_t, 0, 'g', 'B', debug,
"Size allocated",
""
)
More information about the varnish-commit
mailing list