X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fnfsstat%2Fnfsstat.c;h=8f058691d90e2daf4ded6bbaab50c2261b7be9a4;hp=2ab578cc35f4a4978c07178572dd8eb81cc022f4;hb=01849ac100430ada0bf122c0be4cc78b550eb77c;hpb=503b014416f422e4a0f35e5f922d9e42709723b7 diff --git a/utils/nfsstat/nfsstat.c b/utils/nfsstat/nfsstat.c index 2ab578c..8f05869 100644 --- a/utils/nfsstat/nfsstat.c +++ b/utils/nfsstat/nfsstat.c @@ -23,13 +23,13 @@ #define MAXNRVALS 32 -static unsigned int srvv2info[20]; /* NFSv2 call counts ([0] == 18) */ -static unsigned int cltv2info[20]; /* NFSv2 call counts ([0] == 18) */ -static unsigned int srvv3info[24]; /* NFSv3 call counts ([0] == 22) */ -static unsigned int cltv3info[24]; /* NFSv3 call counts ([0] == 22) */ -static unsigned int srvv4info[4]; /* NFSv4 call counts ([0] == 2) */ -static unsigned int cltv4info[34]; /* NFSv4 call counts ([0] == 32) */ -static unsigned int srvv4opinfo[42];/* NFSv4 call counts ([0] == 40) */ +static unsigned int srvproc2info[20]; /* NFSv2 call counts ([0] == 18) */ +static unsigned int cltproc2info[20]; /* NFSv2 call counts ([0] == 18) */ +static unsigned int srvproc3info[24]; /* NFSv3 call counts ([0] == 22) */ +static unsigned int cltproc3info[24]; /* NFSv3 call counts ([0] == 22) */ +static unsigned int srvproc4info[4]; /* NFSv4 call counts ([0] == 2) */ +static unsigned int cltproc4info[34]; /* NFSv4 call counts ([0] == 32) */ +static unsigned int srvproc4opsinfo[42];/* NFSv4 call counts ([0] == 40) */ static unsigned int srvnetinfo[5]; /* 0 # of received packets * 1 UDP packets * 2 TCP packets @@ -86,12 +86,12 @@ static const char * nfsv3name[22] = { "fsstat", "fsinfo", "pathconf", "commit" }; -static const char * nfssrvv4name[2] = { +static const char * nfssrvproc4name[2] = { "null", "compound", }; -static const char * nfscltv4name[32] = { +static const char * nfscltproc4name[32] = { "null", "read", "write", "commit", "open", "open_conf", "open_noat", "open_dgrd", "close", "setattr", "fsinfo", "renew", "setclntid", "confirm", "lock", @@ -100,7 +100,7 @@ static const char * nfscltv4name[32] = { "statfs", "readlink", "readdir", "server_caps", "delegreturn", }; -static const char * nfssrvv4opname[40] = { +static const char * nfssrvproc4opname[40] = { "op0-unused", "op1-unused", "op2-future", "access", "close", "commit", "create", "delegpurge", "delegreturn", "getattr", "getfh", "link", "lock", "lockt", "locku", "lookup", "lookup_root", "nverify", @@ -116,28 +116,36 @@ typedef struct statinfo { unsigned int * valptr; } statinfo; -#define STRUCTSIZE(x) sizeof(x)/sizeof(*x) - -static statinfo srvinfo[] = { - { "net", STRUCTSIZE(srvnetinfo), srvnetinfo }, - { "rpc", STRUCTSIZE(srvrpcinfo), srvrpcinfo }, - { "rc", STRUCTSIZE(srvrcinfo), srvrcinfo }, - { "fh", STRUCTSIZE(srvfhinfo), srvfhinfo }, - { "proc2", STRUCTSIZE(srvv2info), srvv2info }, - { "proc3", STRUCTSIZE(srvv3info), srvv3info }, - { "proc4", STRUCTSIZE(srvv4info), srvv4info }, - { "proc4ops", STRUCTSIZE(srvv4opinfo),srvv4opinfo}, - { 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_CLT(cltinfo); static void print_numbers(const char *, unsigned int *, unsigned int); @@ -369,24 +377,24 @@ main(int argc, char **argv) printf("\n"); } if (opt_prt & PRNT_CALLS) { - if ((opt_prt & PRNT_V2) || ((opt_prt & PRNT_AUTO) && has_stats(srvv2info))) + if ((opt_prt & PRNT_V2) || ((opt_prt & PRNT_AUTO) && has_stats(srvproc2info))) print_callstats( "Server nfs v2:\n", - nfsv2name, srvv2info + 1, sizeof(nfsv2name)/sizeof(char *) + nfsv2name, srvproc2info + 1, sizeof(nfsv2name)/sizeof(char *) ); - if ((opt_prt & PRNT_V3) || ((opt_prt & PRNT_AUTO) && has_stats(srvv3info))) + if ((opt_prt & PRNT_V3) || ((opt_prt & PRNT_AUTO) && has_stats(srvproc3info))) print_callstats( "Server nfs v3:\n", - nfsv3name, srvv3info + 1, sizeof(nfsv3name)/sizeof(char *) + nfsv3name, srvproc3info + 1, sizeof(nfsv3name)/sizeof(char *) ); - if ((opt_prt & PRNT_V4) || ((opt_prt & PRNT_AUTO) && has_stats(srvv4info))) { + if ((opt_prt & PRNT_V4) || ((opt_prt & PRNT_AUTO) && has_stats(srvproc4info))) { print_callstats( "Server nfs v4:\n", - nfssrvv4name, srvv4info + 1, sizeof(nfssrvv4name)/sizeof(char *) + nfssrvproc4name, srvproc4info + 1, sizeof(nfssrvproc4name)/sizeof(char *) ); print_callstats( "Server nfs v4 operations:\n", - nfssrvv4opname, srvv4opinfo + 1, sizeof(nfssrvv4opname)/sizeof(char *) + nfssrvproc4opname, srvproc4opsinfo + 1, sizeof(nfssrvproc4opname)/sizeof(char *) ); } } @@ -410,20 +418,20 @@ main(int argc, char **argv) printf("\n"); } if (opt_prt & PRNT_CALLS) { - if ((opt_prt & PRNT_V2) || ((opt_prt & PRNT_AUTO) && has_stats(cltv2info))) + if ((opt_prt & PRNT_V2) || ((opt_prt & PRNT_AUTO) && has_stats(cltproc2info))) print_callstats( "Client nfs v2:\n", - nfsv2name, cltv2info + 1, sizeof(nfsv2name)/sizeof(char *) + nfsv2name, cltproc2info + 1, sizeof(nfsv2name)/sizeof(char *) ); - if ((opt_prt & PRNT_V3) || ((opt_prt & PRNT_AUTO) && has_stats(cltv3info))) + if ((opt_prt & PRNT_V3) || ((opt_prt & PRNT_AUTO) && has_stats(cltproc3info))) print_callstats( "Client nfs v3:\n", - nfsv3name, cltv3info + 1, sizeof(nfsv3name)/sizeof(char *) + nfsv3name, cltproc3info + 1, sizeof(nfsv3name)/sizeof(char *) ); - if ((opt_prt & PRNT_V4) || ((opt_prt & PRNT_AUTO) && has_stats(cltv4info))) + if ((opt_prt & PRNT_V4) || ((opt_prt & PRNT_AUTO) && has_stats(cltproc4info))) print_callstats( "Client nfs v4:\n", - nfscltv4name, cltv4info + 1, sizeof(nfscltv4name)/sizeof(char *) + nfscltproc4name, cltproc4info + 1, sizeof(nfscltproc4name)/sizeof(char *) ); } }