#include <string.h>
#include <fcntl.h>
#include <errno.h>
+#include <signal.h>
+#include <time.h>
#define MAXNRVALS 32
-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
- * 3 TCP connections
- */
-static unsigned int cltnetinfo[5]; /* 0 # of received packets
- * 1 UDP packets
- * 2 TCP packets
- * 3 TCP connections
- */
-
-static unsigned int srvrpcinfo[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]; /* 0 total # of RPC calls
- * 1 retransmitted calls
- * 2 cred refreshs
- */
-
-static unsigned int srvrcinfo[9]; /* 0 repcache hits
- * 1 repcache hits
- * 2 uncached reqs
- * (for pre-2.4 kernels:)
- * 3 FH lookups
- * 4 'anon' FHs
- * 5 noncached non-directories
- * 6 noncached directories
- * 7 stale
- */
-
-static unsigned int srvfhinfo[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 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
+ * 1 UDP packets
+ * 2 TCP packets
+ * 3 TCP connections
+ */
+static unsigned int cltnetinfo[5], cltnetinfo_tmp[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
+ * 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
+ * 1 retransmitted calls
+ * 2 cred refreshs
+ */
+
+static unsigned int srvrcinfo[9], srvrcinfo_tmp[9]; /* 0 repcache hits
+ * 1 repcache hits
+ * 2 uncached reqs
+ * (for pre-2.4 kernels:)
+ * 3 FH lookups
+ * 4 'anon' FHs
+ * 5 noncached non-directories
+ * 6 noncached directories
+ * 7 stale
+ */
+
+static unsigned int srvfhinfo[7], srvfhinfo_tmp[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",
"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] = {
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(srvproc2info), srvproc2info },
- { "proc3", STRUCTSIZE(srvproc3info), srvproc3info },
- { "proc4", STRUCTSIZE(srvproc4info), srvproc4info },
- { "proc4ops", STRUCTSIZE(srvproc4opsinfo),srvproc4opsinfo},
- { NULL, 0, NULL }
-};
-
-static statinfo cltinfo[] = {
- { "net", STRUCTSIZE(cltnetinfo), cltnetinfo },
- { "rpc", STRUCTSIZE(cltrpcinfo), cltrpcinfo },
- { "proc2", STRUCTSIZE(cltproc2info), cltproc2info },
- { "proc3", STRUCTSIZE(cltproc3info), cltproc3info },
- { "proc4", STRUCTSIZE(cltproc4info), cltproc4info },
- { 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);
static void print_numbers(const char *, unsigned int *,
unsigned int);
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
-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);
{ "zero", 0, 0, 'z' },
{ "help", 0, 0, '\1' },
{ "version", 0, 0, '\2' },
+ { "diff-stat", 0, 0, 'D' },
{ NULL, 0, 0, 0 }
};
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");
return 2;
}
break;
+ case 'D':
+ opt_diffstat = 1;
+ break;
case '2':
case '3':
case '4':
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(
ip->valptr[i] = atoi(sp);
total += ip->valptr[i];
}
- ip->valptr[i] = total;
+ ip->valptr[cnt - 1] = total;
}
fclose(fp);
{
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, should_diff;
+
+ is_srv = (new == srvinfo);
+ for (i = 0; old[i].tag; i++) {
+ for (j = 0; j < new[i].nrvals; j++) {
+ /* skip items in valptr that shouldn't be changed */
+ should_diff = (i < (3 + is_srv) || j > 0);
+ if (should_diff)
+ new[i].valptr[j] -= old[i].valptr[j];
+ }
+ }
+}
+
+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);
+}
projects / nfs-utils.git / blobdiff