X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fnfsstat%2Fnfsstat.c;h=6201f28df8646ab15cbe977ff6409ad7a9fa54f4;hp=76d8f8bb8cad9351591ddb643814e5166acb5260;hb=ed6ecd11fc1a13f76289319248a54c1b5ce5c886;hpb=001844d64a40a9f5fd00cf827b909a6a25f8e4a9 diff --git a/utils/nfsstat/nfsstat.c b/utils/nfsstat/nfsstat.c index 76d8f8b..6201f28 100644 --- a/utils/nfsstat/nfsstat.c +++ b/utils/nfsstat/nfsstat.c @@ -25,36 +25,36 @@ #define MAXNRVALS 32 -static unsigned int srvproc2info[20], srvproc2info_tmp[20]; /* NFSv2 call counts ([0] == 18) */ -static unsigned int cltproc2info[20], cltproc2info_tmp[20]; /* NFSv2 call counts ([0] == 18) */ -static unsigned int srvproc3info[24], srvproc3info_tmp[24]; /* NFSv3 call counts ([0] == 22) */ -static unsigned int cltproc3info[24], cltproc3info_tmp[24]; /* NFSv3 call counts ([0] == 22) */ -static unsigned int srvproc4info[4], srvproc4info_tmp[4]; /* NFSv4 call counts ([0] == 2) */ -static unsigned int cltproc4info[37], cltproc4info_tmp[37]; /* NFSv4 call counts ([0] == 35) */ -static unsigned int srvproc4opsinfo[42], srvproc4opsinfo_tmp[42]; /* NFSv4 call counts ([0] == 40) */ -static unsigned int srvnetinfo[5], srvnetinfo_tmp[5]; /* 0 # of received packets +static unsigned int srvproc2info[20], srvproc2info_old[20]; /* NFSv2 call counts ([0] == 18) */ +static unsigned int cltproc2info[20], cltproc2info_old[20]; /* NFSv2 call counts ([0] == 18) */ +static unsigned int srvproc3info[24], srvproc3info_old[24]; /* NFSv3 call counts ([0] == 22) */ +static unsigned int cltproc3info[24], cltproc3info_old[24]; /* NFSv3 call counts ([0] == 22) */ +static unsigned int srvproc4info[4], srvproc4info_old[4]; /* NFSv4 call counts ([0] == 2) */ +static unsigned int cltproc4info[37], cltproc4info_old[37]; /* NFSv4 call counts ([0] == 35) */ +static unsigned int srvproc4opsinfo[42], srvproc4opsinfo_old[42]; /* NFSv4 call counts ([0] == 40) */ +static unsigned int srvnetinfo[5], srvnetinfo_old[5]; /* 0 # of received packets * 1 UDP packets * 2 TCP packets * 3 TCP connections */ -static unsigned int cltnetinfo[5], cltnetinfo_tmp[5]; /* 0 # of received packets +static unsigned int cltnetinfo[5], cltnetinfo_old[5]; /* 0 # of received packets * 1 UDP packets * 2 TCP packets * 3 TCP connections */ -static unsigned int srvrpcinfo[6], srvrpcinfo_tmp[6]; /* 0 total # of RPC calls +static unsigned int srvrpcinfo[6], srvrpcinfo_old[6]; /* 0 total # of RPC calls * 1 total # of bad calls * 2 bad format * 3 authentication failed * 4 unknown client */ -static unsigned int cltrpcinfo[4], cltrpcinfo_tmp[4]; /* 0 total # of RPC calls +static unsigned int cltrpcinfo[4], cltrpcinfo_old[4]; /* 0 total # of RPC calls * 1 retransmitted calls * 2 cred refreshs */ -static unsigned int srvrcinfo[9], srvrcinfo_tmp[9]; /* 0 repcache hits +static unsigned int srvrcinfo[9], srvrcinfo_old[9]; /* 0 repcache hits * 1 repcache hits * 2 uncached reqs * (for pre-2.4 kernels:) @@ -65,7 +65,7 @@ static unsigned int srvrcinfo[9], srvrcinfo_tmp[9]; /* 0 repcache hits * 7 stale */ -static unsigned int srvfhinfo[7], srvfhinfo_tmp[7]; /* (for kernels >= 2.4.0) +static unsigned int srvfhinfo[7], srvfhinfo_old[7]; /* (for kernels >= 2.4.0) * 0 stale * 1 FH lookups * 2 'anon' FHs @@ -148,9 +148,9 @@ typedef struct statinfo { { NULL, 0, NULL }\ } DECLARE_SRV(srvinfo); -DECLARE_SRV(srvinfo, _tmp); +DECLARE_SRV(srvinfo, _old); DECLARE_CLT(cltinfo); -DECLARE_CLT(cltinfo, _tmp); +DECLARE_CLT(cltinfo, _old); static void print_numbers(const char *, unsigned int *, unsigned int); @@ -164,7 +164,6 @@ static int mounts(const char *); static void get_stats(const char *, statinfo *, int *, int, const char *); static int has_stats(const unsigned int *); -static void copy_stats(statinfo *, statinfo *); static void diff_stats(statinfo *, statinfo *); static void unpause(int); @@ -243,6 +242,11 @@ main(int argc, char **argv) int c; char *progname; + struct statinfo *serverinfo = srvinfo, + *serverinfo_tmp = srvinfo_old, + *clientinfo = cltinfo, + *clientinfo_tmp = cltinfo_old; + struct sigaction act = { .sa_handler = unpause, .sa_flags = SA_ONESHOT, @@ -341,31 +345,34 @@ main(int argc, char **argv) "server.\n"); } + if (opt_sleep) { + serverinfo = srvinfo_old; + serverinfo_tmp = srvinfo; + clientinfo = cltinfo_old; + clientinfo_tmp = cltinfo; + } + if (opt_srv) - get_stats(NFSSRVSTAT, srvinfo, &opt_srv, opt_clt, "Server"); + get_stats(NFSSRVSTAT, serverinfo, &opt_srv, opt_clt, "Server"); if (opt_clt) - get_stats(NFSCLTSTAT, cltinfo, &opt_clt, opt_srv, "Client"); + get_stats(NFSCLTSTAT, clientinfo, &opt_clt, opt_srv, "Client"); /* save stat snapshots; wait for signal; then diff current and saved stats */ if (opt_sleep) { starttime = time(NULL); printf("Collecting statistics; press CTRL-C to view results from interval (i.e., from pause to CTRL-C).\n"); - if (opt_srv) - copy_stats(srvinfo_tmp, srvinfo); - if (opt_clt) - copy_stats(cltinfo_tmp, cltinfo); if (sigaction(SIGINT, &act, NULL) != 0) { fprintf(stderr, "Error: couldn't register for signal and pause.\n"); return 1; } pause(); if (opt_srv) { - get_stats(NFSSRVSTAT, srvinfo, &opt_srv, opt_clt, "Server"); - diff_stats(srvinfo, srvinfo_tmp); + get_stats(NFSSRVSTAT, serverinfo_tmp, &opt_srv, opt_clt, "Server"); + diff_stats(serverinfo_tmp, serverinfo); } if (opt_clt) { - get_stats(NFSCLTSTAT, cltinfo, &opt_clt, opt_srv, "Client"); - diff_stats(cltinfo, cltinfo_tmp); + get_stats(NFSCLTSTAT, clientinfo_tmp, &opt_clt, opt_srv, "Client"); + diff_stats(clientinfo_tmp, clientinfo); } } @@ -650,20 +657,6 @@ has_stats(const unsigned int *info) return (info[0] && info[info[0] + 1] > info[0]); } -/* clone 'src' to 'dest' */ -static void -copy_stats(struct statinfo *dest, struct statinfo *src) -{ - int i, j; - - for (i = 0; src[i].tag; i++) { - dest[i].tag = src[i].tag; - dest[i].nrvals = src[i].nrvals; - for (j = 0; j < dest[i].nrvals; j++) - dest[i].valptr[j] = src[i].valptr[j]; - } -} - /* * take the difference of each individual stat value in 'new' and 'old' * and store the results back into 'new'