-#define STRUCTSIZE(x) sizeof(x)/sizeof(*x)
-
-static statinfo svcinfo[] = {
- { "net", STRUCTSIZE(svcnetinfo), svcnetinfo },
- { "rpc", STRUCTSIZE(svcrpcinfo), svcrpcinfo },
- { "rc", STRUCTSIZE(svcrcinfo), svcrcinfo },
- { "fh", STRUCTSIZE(svcfhinfo), svcfhinfo },
- { "proc2", STRUCTSIZE(svcv2info), svcv2info },
- { "proc3", STRUCTSIZE(svcv3info), svcv3info },
- { "proc4", STRUCTSIZE(svcv4info), svcv4info },
- { "proc4ops", STRUCTSIZE(svcv4opinfo),svcv4opinfo},
- { NULL, 0, NULL }
-};
-
-static statinfo cltinfo[] = {
- { "net", STRUCTSIZE(cltnetinfo), cltnetinfo },
- { "rpc", STRUCTSIZE(cltrpcinfo), cltrpcinfo },
- { "proc2", STRUCTSIZE(cltv2info), cltv2info },
- { "proc3", STRUCTSIZE(cltv3info), cltv3info },
- { "proc4", STRUCTSIZE(cltv4info), cltv4info },
- { NULL, 0, NULL }
-};
+/*
+ * We now build the arrays of statinfos using macros, which will make it easier
+ * to add new variables for --diff-stat.
+ * e.g., SRV(net) expands into the struct statinfo: { "net", 5, srvnetinfo }
+ */
+#define ARRAYSIZE(x) sizeof(x)/sizeof(*x)
+#define STATINFO(k, t, s...) { #t, ARRAYSIZE(k##t##info##s), k##t##info##s }
+#define SRV(t, s...) STATINFO(srv, t, s)
+#define CLT(t, s...) STATINFO(clt, t, s)
+#define DECLARE_SRV(n, s...) static statinfo n##s[] = { \
+ SRV(net,s), \
+ SRV(rpc,s), \
+ SRV(rc,s), \
+ SRV(fh,s), \
+ SRV(proc2,s), \
+ SRV(proc3,s),\
+ SRV(proc4,s), \
+ SRV(proc4ops,s),\
+ { NULL, 0, NULL }\
+ }
+#define DECLARE_CLT(n, s...) static statinfo n##s[] = { \
+ CLT(net,s), \
+ CLT(rpc,s), \
+ CLT(proc2,s),\
+ CLT(proc3,s), \
+ CLT(proc4,s),\
+ { NULL, 0, NULL }\
+ }
+DECLARE_SRV(srvinfo);
+DECLARE_SRV(srvinfo, _tmp);
+DECLARE_CLT(cltinfo);
+DECLARE_CLT(cltinfo, _tmp);