[master] 7d25d3a sync stats order in vsc_all.h and vsc2rst.c by vsc_types.h

Nils Goroll nils.goroll at uplex.de
Mon Mar 16 16:12:12 CET 2015


commit 7d25d3a1acc17814242ba5fbeb707988c418588a
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Mar 16 16:08:04 2015 +0100

    sync stats order in vsc_all.h and vsc2rst.c by vsc_types.h

diff --git a/include/tbl/vsc_all.h b/include/tbl/vsc_all.h
index 53843c6..6cc1805 100644
--- a/include/tbl/vsc_all.h
+++ b/include/tbl/vsc_all.h
@@ -28,21 +28,21 @@
  */
 
 
+VSC_DO(MAIN, main, VSC_type_main)
+#include "tbl/vsc_f_main.h"
+VSC_DONE(MAIN, main, VSC_type_main)
+
 VSC_DO(MGT, mgt, VSC_type_mgt)
 #define VSC_DO_MGT
 #include "tbl/vsc_fields.h"
 #undef VSC_DO_MGT
 VSC_DONE(MGT, mgt, VSC_type_mgt)
 
-VSC_DO(LCK, lck, VSC_type_lck)
-#define VSC_DO_LCK
+VSC_DO(MEMPOOL, mempool, VSC_type_mempool)
+#define VSC_DO_MEMPOOL
 #include "tbl/vsc_fields.h"
-#undef VSC_DO_LCK
-VSC_DONE(LCK, lck, VSC_type_lck)
-
-VSC_DO(MAIN, main, VSC_type_main)
-#include "tbl/vsc_f_main.h"
-VSC_DONE(MAIN, main, VSC_type_main)
+#undef VSC_DO_MEMPOOL
+VSC_DONE(MEMPOOL, mempool, VSC_type_mempool)
 
 VSC_DO(SMA, sma, VSC_type_sma)
 #define VSC_DO_SMA
@@ -62,8 +62,8 @@ VSC_DO(VBE, vbe, VSC_type_vbe)
 #undef VSC_DO_VBE
 VSC_DONE(VBE, vbe, VSC_type_vbe)
 
-VSC_DO(MEMPOOL, mempool, VSC_type_mempool)
-#define VSC_DO_MEMPOOL
+VSC_DO(LCK, lck, VSC_type_lck)
+#define VSC_DO_LCK
 #include "tbl/vsc_fields.h"
-#undef VSC_DO_MEMPOOL
-VSC_DONE(MEMPOOL, mempool, VSC_type_mempool)
+#undef VSC_DO_LCK
+VSC_DONE(LCK, lck, VSC_type_lck)
diff --git a/man/vsc2rst.c b/man/vsc2rst.c
index 66aaa30..d9ad471 100644
--- a/man/vsc2rst.c
+++ b/man/vsc2rst.c
@@ -66,43 +66,57 @@ int main(int argc, char **argv)
 #include "tbl/vsc_levels.h"
 
 	P("");
-	P("MAIN COUNTERS");
-	P("=============");
+	P("MAIN COUNTERS (MAIN.*)");
+	P("======================");
 	P("");
 #include "tbl/vsc_f_main.h"
 
+	P("MANAGEMENT PROCESS COUNTERS (MGT.*)");
+	P("===================================");
 	P("");
-	P("LOCK COUNTERS");
-	P("=============");
+#define VSC_DO_MGT
+#include "tbl/vsc_fields.h"
+#undef VSC_DO_MGT
+
 	P("");
-#define VSC_DO_LCK
+	P("PER MEMORY POOL COUNTERS (MEMPOOL.*)");
+	P("====================================");
+	P("");
+#define VSC_DO_MEMPOOL
 #include "tbl/vsc_fields.h"
-#undef VSC_DO_LCK
+#undef VSC_DO_MEMPOOL
 
 	P("");
-	P("PER MALLOC STORAGE COUNTERS");
-	P("===========================");
+	P("PER MALLOC STORAGE COUNTERS (SMA.*)");
+	P("===================================");
 	P("");
 #define VSC_DO_SMA
 #include "tbl/vsc_fields.h"
 #undef  VSC_DO_SMA
 
 	P("");
-	P("PER FILE STORAGE COUNTERS");
-	P("=========================");
+	P("PER FILE STORAGE COUNTERS (SMF.*)");
+	P("=================================");
 	P("");
 #define VSC_DO_SMF
 #include "tbl/vsc_fields.h"
 #undef VSC_DO_SMF
 
 	P("");
-	P("PER BACKEND COUNTERS");
-	P("====================");
+	P("PER BACKEND COUNTERS (VBE.*)");
+	P("============================");
 	P("");
 #define VSC_DO_VBE
 #include "tbl/vsc_fields.h"
 #undef VSC_DO_VBE
 
+	P("");
+	P("LOCK COUNTERS (LCK.*)");
+	P("=====================");
+	P("");
+#define VSC_DO_LCK
+#include "tbl/vsc_fields.h"
+#undef VSC_DO_LCK
+
 	return (0);
 }
-



More information about the varnish-commit mailing list