X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fnfsstat%2Fnfsstat.c;h=1c44050e3e17ddfa9e93eed47ba757465b017bce;hp=bd105f5d7b1b5d056cbec13966f0ccaaf38c1326;hb=431593f9f485d47aafc7750f356bd45565182c5e;hpb=b129b318836c788e2f3bc6bc1811a1b7beac1b1e diff --git a/utils/nfsstat/nfsstat.c b/utils/nfsstat/nfsstat.c index bd105f5..1c44050 100644 --- a/utils/nfsstat/nfsstat.c +++ b/utils/nfsstat/nfsstat.c @@ -20,6 +20,8 @@ #include #include #include +#include +#include #define MAXNRVALS 32 @@ -28,7 +30,7 @@ static unsigned int cltproc2info[20], cltproc2info_tmp[20]; /* NFSv2 call counts 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[34], cltproc4info_tmp[34]; /* NFSv4 call counts ([0] == 32) */ +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 * 1 UDP packets @@ -91,13 +93,14 @@ static const char * nfssrvproc4name[2] = { "compound", }; -static const char * nfscltproc4name[32] = { +static const char * nfscltproc4name[35] = { "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", + "statfs", "readlink", "readdir", "server_caps", "delegreturn", "getacl", + "setacl", "fs_locations" }; static const char * nfssrvproc4opname[40] = { @@ -161,6 +164,11 @@ 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); + +static time_t starttime; #define PRNT_CALLS 0x0001 #define PRNT_RPC 0x0002 @@ -199,6 +207,7 @@ void usage(char *name) -v, --verbose, --all\tSame as '-o all'\n\ -r, --rpc\t\tShow RPC statistics\n\ -n, --nfs\t\tShow NFS statistics\n\ + -D, --diff-stat\tSaves stats, pauses, diffs current and saved\n\ --version\t\tShow program version\n\ --help\t\tWhat you just did\n\ \n", name); @@ -219,6 +228,7 @@ static struct option longopts[] = { "zero", 0, 0, 'z' }, { "help", 0, 0, '\1' }, { "version", 0, 0, '\2' }, + { "diff-stat", 0, 0, 'D' }, { NULL, 0, 0, 0 } }; @@ -228,16 +238,22 @@ main(int argc, char **argv) int opt_all = 0, opt_srv = 0, opt_clt = 0, - opt_prt = 0; + opt_prt = 0, + opt_diffstat = 0; int c; char *progname; + struct sigaction act = { + .sa_handler = unpause, + .sa_flags = SA_ONESHOT, + }; + if ((progname = strrchr(argv[0], '/'))) progname++; else progname = argv[0]; - while ((c = getopt_long(argc, argv, "234acmno:vrsz\1\2", longopts, NULL)) != EOF) { + while ((c = getopt_long(argc, argv, "234acmno:Dvrsz\1\2", longopts, NULL)) != EOF) { switch (c) { case 'a': fprintf(stderr, "nfsstat: nfs acls are not yet supported.\n"); @@ -267,6 +283,9 @@ main(int argc, char **argv) return 2; } break; + case 'D': + opt_diffstat = 1; + break; case '2': case '3': case '4': @@ -327,6 +346,29 @@ main(int argc, char **argv) if (opt_clt) get_stats(NFSCLTSTAT, cltinfo, &opt_clt, opt_srv, "Client"); + /* save stat snapshots; wait for signal; then diff current and saved stats */ + if (opt_diffstat) { + 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); + } + if (opt_clt) { + get_stats(NFSCLTSTAT, cltinfo, &opt_clt, opt_srv, "Client"); + diff_stats(cltinfo, cltinfo_tmp); + } + } + if (opt_srv) { if (opt_prt & PRNT_NET) { print_numbers( @@ -529,7 +571,7 @@ parse_statfile(const char *name, struct statinfo *statp) ip->valptr[i] = atoi(sp); total += ip->valptr[i]; } - ip->valptr[i] = total; + ip->valptr[cnt - 1] = total; } fclose(fp); @@ -596,8 +638,83 @@ get_stats(const char *file, statinfo *info, int *opt, int other_opt, const char } } +/* + * This is for proc2/3/4-type stats, where, in the /proc files, the first entry's value + * denotes the number of subsequent entries. statinfo value arrays contain an additional + * field at the end which contains the sum of all previous elements in the array -- so, + * there are stats if the sum's greater than the entry-count. + */ static int has_stats(const unsigned int *info) { - return (info[0] && info[info[0] + 1] != info[0]); + 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' + */ +static void +diff_stats(struct statinfo *new, struct statinfo *old) +{ + int i, j, is_srv, nodiff_first_index, should_diff; + + /* + * Different stat types have different formats in the /proc + * files: for the proc2/3/4-type stats, the first entry has + * the total number of subsequent entries; one does not want + * to diff that first entry. The other stat types aren't like + * this. So, we diff a given entry if it's not of one of the + * procX types ("i" < 2 for clt, < 4 for srv), or if it's not + * the first entry ("j" > 0). + */ + is_srv = (new == srvinfo); + nodiff_first_index = 2 + (2 * is_srv); + + for (i = 0; old[i].tag; i++) { + for (j = 0; j < new[i].nrvals; j++) { + should_diff = (i < nodiff_first_index || j > 0); + if (should_diff) + new[i].valptr[j] -= old[i].valptr[j]; + } + + /* + * Make sure that the "totals" entry (last value in + * each stat array) for the procX-type stats has the + * "numentries" entry's (first value in procX-type + * stat arrays) constant value added-back after the + * diff -- i.e., it should always be included in the + * total. + */ + if (!strncmp("proc", new[i].tag, 4)) + new[i].valptr[new[i].nrvals - 1] += new[i].valptr[0]; + } +} + +static void +unpause(int sig) +{ + double time_diff; + int minutes, seconds; + time_t endtime; + + endtime = time(NULL); + time_diff = difftime(endtime, starttime); + minutes = time_diff / 60; + seconds = (int)time_diff % 60; + printf("Signal received; displaying (only) statistics gathered over the last %d minutes, %d seconds:\n\n", minutes, seconds); }