[master] 5cb82e1 Drop duplicate table definitions for the counter tables.

Martin Blix Grydeland martin at varnish-software.com
Tue Jan 27 17:17:56 CET 2015


commit 5cb82e1ee18d1fcc350871585c7da9175f427e3a
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Fri Jan 16 13:42:16 2015 +0100

    Drop duplicate table definitions for the counter tables.
    
    Refer to the file with the definition instead.

diff --git a/include/tbl/vsc_f_main.h b/include/tbl/vsc_f_main.h
index 55e6fa3..87555ed 100644
--- a/include/tbl/vsc_f_main.h
+++ b/include/tbl/vsc_f_main.h
@@ -26,35 +26,9 @@
  * 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 - Explanation:	Short explanation of field (for screen use)
- *    d - Description:	Long explanation of field (for doc use)
- *
- * Please describe Gauge variables as "Number of..." to indicate that
- * this is a snapshot, and Counter variables as "Count of" to indicate
- * accumulative count.
- *
- * -----------------------
- * 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.
+ * Definition of the main shared memory statistics below.
  *
+ * See include/tbl/vsc_fields.h for the table definition.
  */
 
 /*--------------------------------------------------------------------
diff --git a/include/tbl/vsc_fields.h b/include/tbl/vsc_fields.h
index 5d8a281..77b3b71 100644
--- a/include/tbl/vsc_fields.h
+++ b/include/tbl/vsc_fields.h
@@ -26,7 +26,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Definition of all shared memory statistics below.
+ * Definition of all shared memory statistics below (except main - see
+ * include/tbl/vsc_f_main.h).
  *
  * Fields (n, t, l, f, v, e, d):
  *    n - Name:		Field name, in C-source and stats programs



More information about the varnish-commit mailing list