X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fnfsstat%2Fnfsstat.c;h=0f65000a7334e26aabf7e1f2cbe4d191df7024ac;hp=55b5cd08d90c06dec6e7dfbfa260b1258ddffd39;hb=9a78577afffa5ba6e6e60adf8a28bf02408e13a9;hpb=8b7ad01b14df1e7529b9ba8a1ea17df0d6004ef9 diff --git a/utils/nfsstat/nfsstat.c b/utils/nfsstat/nfsstat.c index 55b5cd0..0f65000 100644 --- a/utils/nfsstat/nfsstat.c +++ b/utils/nfsstat/nfsstat.c @@ -1,7 +1,7 @@ /* * nfsstat.c Output NFS statistics * - * Copyright (C) 1995, 1996, 1999 Olaf Kirch + * Copyright (C) 1995-2005 Olaf Kirch */ #include "config.h" @@ -9,6 +9,8 @@ #define NFSSVCSTAT "/proc/net/rpc/nfsd" #define NFSCLTSTAT "/proc/net/rpc/nfs" +#define MOUNTSFILE "/proc/mounts" + #include #include #include @@ -18,44 +20,55 @@ #define MAXNRVALS 32 -static unsigned int svcv2info[19]; /* NFSv2 call counts ([0] == 18) */ -static unsigned int cltv2info[19]; /* NFSv2 call counts ([0] == 18) */ -static unsigned int svcv3info[22]; /* NFSv3 call counts ([0] == 22) */ -static unsigned int cltv3info[22]; /* NFSv3 call counts ([0] == 22) */ -static unsigned int svcnetinfo[4]; /* 0 # of received packets +static unsigned int svcv2info[20]; /* NFSv2 call counts ([0] == 18) */ +static unsigned int cltv2info[20]; /* NFSv2 call counts ([0] == 18) */ +static unsigned int svcv3info[24]; /* NFSv3 call counts ([0] == 22) */ +static unsigned int cltv3info[24]; /* NFSv3 call counts ([0] == 22) */ +static unsigned int svcv4info[4]; /* NFSv4 call counts ([0] == 2) */ +static unsigned int cltv4info[34]; /* NFSv4 call counts ([0] == 32) */ +static unsigned int svcnetinfo[5]; /* 0 # of received packets * 1 UDP packets * 2 TCP packets * 3 TCP connections */ -static unsigned int cltnetinfo[4]; /* 0 # of received packets +static unsigned int cltnetinfo[5]; /* 0 # of received packets * 1 UDP packets * 2 TCP packets * 3 TCP connections */ -static unsigned int svcrpcinfo[5]; /* 0 total # of RPC calls +static unsigned int svcrpcinfo[6]; /* 0 total # of RPC calls * 1 total # of bad calls * 2 bad format * 3 authentication failed * 4 unknown client */ -static unsigned int cltrpcinfo[3]; /* 0 total # of RPC calls +static unsigned int cltrpcinfo[4]; /* 0 total # of RPC calls * 1 retransmitted calls * 2 cred refreshs */ -static unsigned int svcrcinfo[8]; /* 0 repcache hits +static unsigned int svcrcinfo[9]; /* 0 repcache hits * 1 repcache hits * 2 uncached reqs - * - * including fh info: - * 3 cached fh's - * 4 valid fh's - * 5 fixup required - * 6 lookup (?) + * (for pre-2.4 kernels:) + * 3 FH lookups + * 4 'anon' FHs + * 5 noncached non-directories + * 6 noncached directories * 7 stale */ +static unsigned int svcfhinfo[7]; /* (for kernels >= 2.4.0) + * 0 stale + * 1 FH lookups + * 2 'anon' FHs + * 3 noncached directories + * 4 noncached non-directories + * leave hole to relocate stale for order + * compatability. + */ + static const char * nfsv2name[18] = { "null", "getattr", "setattr", "root", "lookup", "readlink", "read", "wrcache", "write", "create", "remove", "rename", @@ -69,30 +82,46 @@ static const char * nfsv3name[22] = { "fsstat", "fsinfo", "pathconf", "commit" }; +static const char * nfssvrv4name[2] = { + "null", + "compound", +}; + +static const char * nfscltv4name[32] = { + "null", "read", "write", "commit", "open", "open_conf", + "open_noat", "open_dgrd", "close", "setattr", "fsinfo", "renew", + "setclntid", "confirm", "lock", + "lockt", "locku", "access", "getattr", "lookup", "lookup_root", + "remove", "rename", "link", "symlink", "create", "pathconf", + "statfs", "readlink", "readdir", "server_caps", "delegreturn", +}; + typedef struct statinfo { char *tag; int nrvals; unsigned int * valptr; - - /* Filled in by parse_statfile */ - int * foundp; } statinfo; +#define STRUCTSIZE(x) sizeof(x)/sizeof(*x) + static statinfo svcinfo[] = { - { "net", 4, svcnetinfo }, - { "rpc", 5, svcrpcinfo }, - { "rc", 8, svcrcinfo }, /* including fh_* */ - { "proc2", 19, svcv2info }, - { "proc3", 23, svcv3info }, - { NULL, 0, 0 } + { "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 }, + { NULL, 0, NULL } }; static statinfo cltinfo[] = { - { "net", 4, cltnetinfo }, - { "rpc", 3, cltrpcinfo }, - { "proc2", 19, cltv2info }, - { "proc3", 23, cltv3info }, - { NULL, 0, 0 } + { "net", STRUCTSIZE(cltnetinfo), cltnetinfo }, + { "rpc", STRUCTSIZE(cltrpcinfo), cltrpcinfo }, + { "proc2", STRUCTSIZE(cltv2info), cltv2info }, + { "proc3", STRUCTSIZE(cltv3info), cltv3info }, + { "proc4", STRUCTSIZE(cltv4info), cltv4info }, + { NULL, 0, NULL } }; static void print_numbers(const char *, unsigned int *, @@ -101,12 +130,16 @@ static void print_callstats(const char *, const char **, unsigned int *, unsigned int); static int parse_statfile(const char *, struct statinfo *); +static statinfo *get_stat_info(const char *, struct statinfo *); + +static int mounts(const char *); + #define PRNT_CALLS 0x0001 #define PRNT_RPC 0x0002 #define PRNT_NET 0x0004 #define PRNT_FH 0x0008 #define PRNT_RC 0x0010 -#define PRNT_ALL 0xffff +#define PRNT_ALL 0x0fff int main(int argc, char **argv) @@ -114,10 +147,12 @@ main(int argc, char **argv) int opt_all = 0, opt_srv = 0, opt_clt = 0, + srv_info = 0, + clt_info = 0, opt_prt = 0; int c; - while ((c = getopt(argc, argv, "acno:rsz")) != -1) { + while ((c = getopt(argc, argv, "acmno:rsz")) != -1) { switch (c) { case 'a': opt_all = 1; @@ -139,6 +174,8 @@ main(int argc, char **argv) opt_prt |= PRNT_RC; else if (!strcmp(optarg, "fh")) opt_prt |= PRNT_FH; + else if (!strcmp(optarg, "all")) + opt_prt |= PRNT_CALLS | PRNT_RPC | PRNT_NET | PRNT_RC | PRNT_FH; else { fprintf(stderr, "nfsstat: unknown category: " "%s\n", optarg); @@ -155,6 +192,8 @@ main(int argc, char **argv) fprintf(stderr, "nfsstat: zeroing of nfs statistics " "not yet supported\n"); return 2; + case 'm': + return mounts(MOUNTSFILE); } } @@ -174,9 +213,25 @@ main(int argc, char **argv) "server.\n"); } - if ((opt_srv && !parse_statfile(NFSSVCSTAT, svcinfo)) - || (opt_clt && !parse_statfile(NFSCLTSTAT, cltinfo))) - return 2; + if (opt_srv) { + srv_info = parse_statfile(NFSSVCSTAT, svcinfo); + if (srv_info == 0 && opt_clt == 0) { + fprintf(stderr, "Warning: No Server Stats (%s: %m).\n", NFSSVCSTAT); + return 2; + } + if (srv_info == 0) + opt_srv = 0; + } + + if (opt_clt) { + clt_info = parse_statfile(NFSCLTSTAT, cltinfo); + if (opt_srv == 0 && clt_info == 0) { + fprintf(stderr, "Warning: No Client Stats (%s: %m).\n", NFSCLTSTAT); + return 2; + } + if (clt_info == 0) + opt_clt = 0; + } if (opt_srv) { if (opt_prt & PRNT_NET) { @@ -185,6 +240,7 @@ main(int argc, char **argv) "packets udp tcp tcpconn\n", svcnetinfo, 4 ); + printf("\n"); } if (opt_prt & PRNT_RPC) { print_numbers( @@ -192,6 +248,7 @@ main(int argc, char **argv) "calls badcalls badauth badclnt xdrcall\n", svcrpcinfo, 5 ); + printf("\n"); } if (opt_prt & PRNT_RC) { print_numbers( @@ -199,22 +256,48 @@ main(int argc, char **argv) "hits misses nocache\n", svcrcinfo, 3 ); + printf("\n"); } + + /* + * 2.2 puts all fh-related info after the 'rc' header + * 2.4 puts all fh-related info after the 'fh' header, but relocates + * 'stale' to the start and swaps dir and nondir :-( + * We preseve the 2.2 order + */ if (opt_prt & PRNT_FH) { - print_numbers( - "Server file handle cache:\n" - "cached valid fixup lookup stale\n", - svcrcinfo + 3, 5); + if (get_stat_info("fh", svcinfo)) { /* >= 2.4 */ + int t = svcfhinfo[3]; + svcfhinfo[3]=svcfhinfo[4]; + svcfhinfo[4]=t; + + svcfhinfo[5]=svcfhinfo[0]; /* relocate 'stale' */ + + print_numbers( + "Server file handle cache:\n" + "lookup anon ncachedir ncachedir stale\n", + svcfhinfo + 1, 5); + } else /* < 2.4 */ + print_numbers( + "Server file handle cache:\n" + "lookup anon ncachedir ncachedir stale\n", + svcrcinfo + 3, 5); + printf("\n"); } if (opt_prt & PRNT_CALLS) { print_callstats( "Server nfs v2:\n", - nfsv2name, svcv2info + 1, 18 + nfsv2name, svcv2info + 1, sizeof(nfsv2name)/sizeof(char *) ); - if (svcv3info[0]) + if (svcv3info[0]) print_callstats( "Server nfs v3:\n", - nfsv3name, svcv3info + 1, 22 + nfsv3name, svcv3info + 1, sizeof(nfsv3name)/sizeof(char *) + ); + if (svcv4info[0]) + print_callstats( + "Server nfs v4:\n", + nfssvrv4name, svcv4info + 1, sizeof(nfssvrv4name)/sizeof(char *) ); } } @@ -226,6 +309,7 @@ main(int argc, char **argv) "packets udp tcp tcpconn\n", cltnetinfo, 4 ); + printf("\n"); } if (opt_prt & PRNT_RPC) { print_numbers( @@ -233,16 +317,22 @@ main(int argc, char **argv) "calls retrans authrefrsh\n", cltrpcinfo, 3 ); + printf("\n"); } if (opt_prt & PRNT_CALLS) { print_callstats( "Client nfs v2:\n", - nfsv2name, cltv2info + 1, 18 + nfsv2name, cltv2info + 1, sizeof(nfsv2name)/sizeof(char *) ); - if (cltv3info[0]) + if (cltv3info[0]) print_callstats( "Client nfs v3:\n", - nfsv3name, cltv3info + 1, 22 + nfsv3name, cltv3info + 1, sizeof(nfsv3name)/sizeof(char *) + ); + if (cltv4info[0]) + print_callstats( + "Client nfs v4:\n", + nfscltv4name, cltv4info + 1, sizeof(nfscltv4name)/sizeof(char *) ); } } @@ -250,6 +340,19 @@ main(int argc, char **argv) return 0; } +static statinfo * +get_stat_info(const char *sp, struct statinfo *statp) +{ + struct statinfo *ip; + + for (ip = statp; ip->tag; ip++) { + if (!strcmp(sp, ip->tag)) + return ip; + } + + return NULL; +} + static void print_numbers(const char *hdr, unsigned int *info, unsigned int nr) { @@ -265,7 +368,8 @@ static void print_callstats(const char *hdr, const char **names, unsigned int *info, unsigned int nr) { - unsigned int total; + unsigned long long total; + unsigned long long pct; int i, j; fputs(hdr, stdout); @@ -275,16 +379,18 @@ print_callstats(const char *hdr, const char **names, total = 1; for (i = 0; i < nr; i += 6) { for (j = 0; j < 6 && i + j < nr; j++) - printf("%-11s", names[i+j]); + printf("%-13s", names[i+j]); printf("\n"); - for (j = 0; j < 6 && i + j < nr; j++) - printf("%-6d %2d%% ", - info[i+j], 100 * info[i+j] / total); + for (j = 0; j < 6 && i + j < nr; j++) { + pct = ((unsigned long long) info[i+j]*100)/total; + printf("%-8d%3llu%% ", info[i+j], pct); + } printf("\n"); } printf("\n"); } + static int parse_statfile(const char *name, struct statinfo *statp) { @@ -295,32 +401,82 @@ parse_statfile(const char *name, struct statinfo *statp) * be a fatal error -- it usually means the module isn't loaded. */ if ((fp = fopen(name, "r")) == NULL) { - fprintf(stderr, "Warning: %s: %m\n", name); - return 1; + // fprintf(stderr, "Warning: %s: %m\n", name); + return 0; } while (fgets(buffer, sizeof(buffer), fp) != NULL) { struct statinfo *ip; char *sp, *line = buffer; - int i, cnt; + unsigned int i, cnt; + unsigned int total = 0; if ((next = strchr(line, '\n')) != NULL) *next++ = '\0'; if (!(sp = strtok(line, " \t"))) continue; - for (ip = statp; ip->tag; ip++) { - if (!strcmp(sp, ip->tag)) - break; - } - if (!ip->tag) + + ip = get_stat_info(sp, statp); + if (!ip) continue; + cnt = ip->nrvals; for (i = 0; i < cnt; i++) { if (!(sp = strtok(NULL, " \t"))) break; ip->valptr[i] = atoi(sp); + total += ip->valptr[i]; } + ip->valptr[i] = total; + } + + fclose(fp); + return 1; +} + +static int +mounts(const char *name) +{ + char buffer[4096], *next; + FILE *fp; + + /* Being unable to read e.g. the nfsd stats file shouldn't + * be a fatal error -- it usually means the module isn't loaded. + */ + if ((fp = fopen(name, "r")) == NULL) { + fprintf(stderr, "Warning: %s: %m\n", name); + return 0; + } + + while (fgets(buffer, sizeof(buffer), fp) != NULL) { + char *line = buffer; + char *device, *mount, *type, *flags; + + if ((next = strchr(line, '\n')) != NULL) + *next = '\0'; + + if (!(device = strtok(line, " \t"))) + continue; + + if (!(mount = strtok(NULL, " \t"))) + continue; + + if (!(type = strtok(NULL, " \t"))) + continue; + + if (strcmp(type, "nfs")) { + continue; + } + + if (!(flags = strtok(NULL, " \t"))) + continue; + + printf("%s from %s\n", mount, device); + printf(" Flags:\t%s\n", flags); + printf("\n"); + + continue; } fclose(fp);