static int mounts(const char *);
-static void get_stats(const char *, statinfo *, int *, int, const char *);
+static void get_stats(const char *, struct statinfo *, int *, int,
+ int);
static int has_stats(const unsigned int *);
-static void copy_stats(statinfo *, statinfo *);
-static void diff_stats(statinfo *, statinfo *);
+static void diff_stats(struct statinfo *, struct statinfo *, int);
static void unpause(int);
static time_t starttime;
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,
"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, 1);
if (opt_clt)
- get_stats(NFSCLTSTAT, cltinfo, &opt_clt, opt_srv, "Client");
+ get_stats(NFSCLTSTAT, clientinfo, &opt_clt, opt_srv, 0);
/* 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_old, srvinfo);
- if (opt_clt)
- copy_stats(cltinfo_old, 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_old);
+ get_stats(NFSSRVSTAT, serverinfo_tmp, &opt_srv, opt_clt, 1);
+ diff_stats(serverinfo_tmp, serverinfo, 1);
}
if (opt_clt) {
- get_stats(NFSCLTSTAT, cltinfo, &opt_clt, opt_srv, "Client");
- diff_stats(cltinfo, cltinfo_old);
+ get_stats(NFSCLTSTAT, clientinfo_tmp, &opt_clt, opt_srv, 0);
+ diff_stats(clientinfo_tmp, clientinfo, 0);
}
}
}
static void
-get_stats(const char *file, statinfo *info, int *opt, int other_opt, const char *label)
+get_stats(const char *file, struct statinfo *info, int *opt, int other_opt,
+ int is_srv)
{
+ const char *label = is_srv ? "Server" : "Client";
+
if (!parse_statfile(file, info)) {
if (!other_opt) {
fprintf(stderr, "Warning: No %s Stats (%s: %m). \n", label, file);
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)
+diff_stats(struct statinfo *new, struct statinfo *old, int is_srv)
{
- int i, j, is_srv, nodiff_first_index, should_diff;
+ int i, j, nodiff_first_index, should_diff;
/*
* Different stat types have different formats in the /proc
* 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++) {