nfsstat: #define stat header labels.

[nfs-utils.git] / utils / nfsstat / nfsstat.c

diff --git a/utils/nfsstat/nfsstat.c b/utils/nfsstat/nfsstat.c
index 6201f28df8646ab15cbe977ff6409ad7a9fa54f4..c6f2ace0032a0500a2f6f70ce884d5f66ed0761f 100644 (file)
--- a/utils/nfsstat/nfsstat.c
+++ b/utils/nfsstat/nfsstat.c
@@ -113,19 +113,34 @@ static const char *     nfssrvproc4opname[40] = {
         "setcltidconf", "verify",     "write",       "rellockowner"
 };
 
         "setcltidconf", "verify",     "write",       "rellockowner"
 };
 

+#define LABEL_srvnet           "Server packet stats:\n"
+#define LABEL_srvrpc           "Server rpc stats:\n"
+#define LABEL_srvrc            "Server reply cache:\n"
+#define LABEL_srvfh            "Server file handle cache:\n"
+#define LABEL_srvproc2         "Server nfs v2:\n"
+#define LABEL_srvproc3         "Server nfs v3:\n"
+#define LABEL_srvproc4         "Server nfs v4:\n"
+#define LABEL_srvproc4ops      "Server nfs v4 operations:\n"
+#define LABEL_cltnet           "Client packet stats:\n"
+#define LABEL_cltrpc           "Client rpc stats:\n"
+#define LABEL_cltproc2         "Client nfs v2:\n"
+#define LABEL_cltproc3         "Client nfs v3:\n"
+#define LABEL_cltproc4         "Client nfs v4:\n"
+

 typedef struct statinfo {
        char            *tag;
 typedef struct statinfo {
        char            *tag;

+       char            *label;

        int             nrvals;
        unsigned int *  valptr;
 } statinfo;
 
 /*
  * We now build the arrays of statinfos using macros, which will make it easier
        int             nrvals;
        unsigned int *  valptr;
 } statinfo;
 
 /*
  * 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 }
+ * to add new variables for --sleep.  e.g., SRV(net) expands into the struct
+ * statinfo:  { "net", "Server packet stats:\n", 5, srvnetinfo }

  */
 #define ARRAYSIZE(x)           sizeof(x)/sizeof(*x)
  */
 #define ARRAYSIZE(x)           sizeof(x)/sizeof(*x)

-#define STATINFO(k, t, s...)   { #t, ARRAYSIZE(k##t##info##s), k##t##info##s }
+#define STATINFO(k, t, s...)   { #t, LABEL_##k##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[] = { \
 #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[] = { \


@@ -137,7 +152,7 @@ typedef struct statinfo {
                                        SRV(proc3,s),\
                                        SRV(proc4,s), \
                                        SRV(proc4ops,s),\
                                        SRV(proc3,s),\
                                        SRV(proc4,s), \
                                        SRV(proc4ops,s),\

-                                       { NULL, 0, NULL }\
+                                       { NULL, NULL, 0, NULL }\

                                }
 #define DECLARE_CLT(n, s...)   static statinfo n##s[] = { \
                                        CLT(net,s), \
                                }
 #define DECLARE_CLT(n, s...)   static statinfo n##s[] = { \
                                        CLT(net,s), \


@@ -145,7 +160,7 @@ typedef struct statinfo {
                                        CLT(proc2,s),\
                                        CLT(proc3,s), \
                                        CLT(proc4,s),\
                                        CLT(proc2,s),\
                                        CLT(proc3,s), \
                                        CLT(proc4,s),\

-                                       { NULL, 0, NULL }\
+                                       { NULL, NULL, 0, NULL }\

                                }
 DECLARE_SRV(srvinfo);
 DECLARE_SRV(srvinfo, _old);
                                }
 DECLARE_SRV(srvinfo);
 DECLARE_SRV(srvinfo, _old);


@@ -162,9 +177,10 @@ static statinfo            *get_stat_info(const char *, struct statinfo *);
 
 static int             mounts(const char *);
 
 
 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 int             has_stats(const unsigned int *);

-static void            diff_stats(statinfo *, statinfo *);
+static void            diff_stats(struct statinfo *, struct statinfo *, int);

 static void            unpause(int);
 
 static time_t          starttime;
 static void            unpause(int);
 
 static time_t          starttime;


@@ -353,9 +369,9 @@ main(int argc, char **argv)
        }
 
        if (opt_srv)
        }
 
        if (opt_srv)

-               get_stats(NFSSRVSTAT, serverinfo, &opt_srv, opt_clt, "Server");
+               get_stats(NFSSRVSTAT, serverinfo, &opt_srv, opt_clt, 1);

        if (opt_clt)
        if (opt_clt)

-               get_stats(NFSCLTSTAT, clientinfo, &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) {
 
        /* save stat snapshots; wait for signal; then diff current and saved stats */
        if (opt_sleep) {


@@ -367,19 +383,19 @@ main(int argc, char **argv)
                }
                pause();
                if (opt_srv) {
                }
                pause();
                if (opt_srv) {

-                       get_stats(NFSSRVSTAT, serverinfo_tmp, &opt_srv, opt_clt, "Server");
-                       diff_stats(serverinfo_tmp, serverinfo);
+                       get_stats(NFSSRVSTAT, serverinfo_tmp, &opt_srv, opt_clt, 1);
+                       diff_stats(serverinfo_tmp, serverinfo, 1);

                }
                if (opt_clt) {
                }
                if (opt_clt) {

-                       get_stats(NFSCLTSTAT, clientinfo_tmp, &opt_clt, opt_srv, "Client");
-                       diff_stats(clientinfo_tmp, clientinfo);
+                       get_stats(NFSCLTSTAT, clientinfo_tmp, &opt_clt, opt_srv, 0);
+                       diff_stats(clientinfo_tmp, clientinfo, 0);

                }
        }
 
        if (opt_srv) {
                if (opt_prt & PRNT_NET) {
                        print_numbers(
                }
        }
 
        if (opt_srv) {
                if (opt_prt & PRNT_NET) {
                        print_numbers(

-                       "Server packet stats:\n"
+                       LABEL_srvnet

                        "packets    udp        tcp        tcpconn\n",
                        srvnetinfo, 4
                        );
                        "packets    udp        tcp        tcpconn\n",
                        srvnetinfo, 4
                        );


@@ -387,7 +403,7 @@ main(int argc, char **argv)
                }
                if (opt_prt & PRNT_RPC) {
                        print_numbers(
                }
                if (opt_prt & PRNT_RPC) {
                        print_numbers(

-                       "Server rpc stats:\n"
+                       LABEL_srvrpc

                        "calls      badcalls   badauth    badclnt    xdrcall\n",
                        srvrpcinfo, 5
                        );
                        "calls      badcalls   badauth    badclnt    xdrcall\n",
                        srvrpcinfo, 5
                        );


@@ -395,7 +411,7 @@ main(int argc, char **argv)
                }
                if (opt_prt & PRNT_RC) {
                        print_numbers(
                }
                if (opt_prt & PRNT_RC) {
                        print_numbers(

-                       "Server reply cache:\n"
+                       LABEL_srvrc

                        "hits       misses     nocache\n",
                        srvrcinfo, 3
                        );
                        "hits       misses     nocache\n",
                        srvrcinfo, 3
                        );


@@ -417,12 +433,12 @@ main(int argc, char **argv)
                                srvfhinfo[5]=srvfhinfo[0]; /* relocate 'stale' */
                                
                                print_numbers(
                                srvfhinfo[5]=srvfhinfo[0]; /* relocate 'stale' */
                                
                                print_numbers(

-                                       "Server file handle cache:\n"
+                                       LABEL_srvfh

                                        "lookup     anon       ncachedir  ncachedir  stale\n",
                                        srvfhinfo + 1, 5);
                        } else                                  /* < 2.4 */
                                print_numbers(
                                        "lookup     anon       ncachedir  ncachedir  stale\n",
                                        srvfhinfo + 1, 5);
                        } else                                  /* < 2.4 */
                                print_numbers(

-                                       "Server file handle cache:\n"
+                                       LABEL_srvfh

                                        "lookup     anon       ncachedir  ncachedir  stale\n",
                                        srvrcinfo + 3, 5);
                        printf("\n");
                                        "lookup     anon       ncachedir  ncachedir  stale\n",
                                        srvrcinfo + 3, 5);
                        printf("\n");


@@ -430,21 +446,21 @@ main(int argc, char **argv)
                if (opt_prt & PRNT_CALLS) {
                        if ((opt_prt & PRNT_V2) || ((opt_prt & PRNT_AUTO) && has_stats(srvproc2info)))
                                print_callstats(
                if (opt_prt & PRNT_CALLS) {
                        if ((opt_prt & PRNT_V2) || ((opt_prt & PRNT_AUTO) && has_stats(srvproc2info)))
                                print_callstats(

-                               "Server nfs v2:\n",
-                                   nfsv2name, srvproc2info + 1, sizeof(nfsv2name)/sizeof(char *)
+                               LABEL_srvproc2,
+                               nfsv2name, srvproc2info + 1, sizeof(nfsv2name)/sizeof(char *)

                                );
                        if ((opt_prt & PRNT_V3) || ((opt_prt & PRNT_AUTO) && has_stats(srvproc3info)))
                                print_callstats(
                                );
                        if ((opt_prt & PRNT_V3) || ((opt_prt & PRNT_AUTO) && has_stats(srvproc3info)))
                                print_callstats(

-                               "Server nfs v3:\n",
+                               LABEL_srvproc3,

                                nfsv3name, srvproc3info + 1, sizeof(nfsv3name)/sizeof(char *)
                                );
                        if ((opt_prt & PRNT_V4) || ((opt_prt & PRNT_AUTO) && has_stats(srvproc4info))) {
                                print_callstats(
                                nfsv3name, srvproc3info + 1, sizeof(nfsv3name)/sizeof(char *)
                                );
                        if ((opt_prt & PRNT_V4) || ((opt_prt & PRNT_AUTO) && has_stats(srvproc4info))) {
                                print_callstats(

-                               "Server nfs v4:\n",
+                               LABEL_srvproc4,

                                nfssrvproc4name, srvproc4info + 1, sizeof(nfssrvproc4name)/sizeof(char *)
                                );
                                print_callstats(
                                nfssrvproc4name, srvproc4info + 1, sizeof(nfssrvproc4name)/sizeof(char *)
                                );
                                print_callstats(

-                               "Server nfs v4 operations:\n",
+                               LABEL_srvproc4ops,

                                nfssrvproc4opname, srvproc4opsinfo + 1, sizeof(nfssrvproc4opname)/sizeof(char *)
                                );
                        }
                                nfssrvproc4opname, srvproc4opsinfo + 1, sizeof(nfssrvproc4opname)/sizeof(char *)
                                );
                        }


@@ -454,7 +470,7 @@ main(int argc, char **argv)
        if (opt_clt) {
                if (opt_prt & PRNT_NET) {
                        print_numbers(
        if (opt_clt) {
                if (opt_prt & PRNT_NET) {
                        print_numbers(

-                       "Client packet stats:\n"
+                       LABEL_cltnet

                        "packets    udp        tcp        tcpconn\n",
                        cltnetinfo, 4
                        );
                        "packets    udp        tcp        tcpconn\n",
                        cltnetinfo, 4
                        );


@@ -462,7 +478,7 @@ main(int argc, char **argv)
                }
                if (opt_prt & PRNT_RPC) {
                        print_numbers(
                }
                if (opt_prt & PRNT_RPC) {
                        print_numbers(

-                       "Client rpc stats:\n"
+                       LABEL_cltrpc

                        "calls      retrans    authrefrsh\n",
                        cltrpcinfo, 3
                        );
                        "calls      retrans    authrefrsh\n",
                        cltrpcinfo, 3
                        );


@@ -471,17 +487,17 @@ main(int argc, char **argv)
                if (opt_prt & PRNT_CALLS) {
                        if ((opt_prt & PRNT_V2) || ((opt_prt & PRNT_AUTO) && has_stats(cltproc2info)))
                                print_callstats(
                if (opt_prt & PRNT_CALLS) {
                        if ((opt_prt & PRNT_V2) || ((opt_prt & PRNT_AUTO) && has_stats(cltproc2info)))
                                print_callstats(

-                               "Client nfs v2:\n",
+                               LABEL_cltproc2,

                                nfsv2name, cltproc2info + 1,  sizeof(nfsv2name)/sizeof(char *)
                                );
                        if ((opt_prt & PRNT_V3) || ((opt_prt & PRNT_AUTO) && has_stats(cltproc3info)))
                                print_callstats(
                                nfsv2name, cltproc2info + 1,  sizeof(nfsv2name)/sizeof(char *)
                                );
                        if ((opt_prt & PRNT_V3) || ((opt_prt & PRNT_AUTO) && has_stats(cltproc3info)))
                                print_callstats(

-                               "Client nfs v3:\n",
+                               LABEL_cltproc3,

                                nfsv3name, cltproc3info + 1, sizeof(nfsv3name)/sizeof(char *)
                                );
                        if ((opt_prt & PRNT_V4) || ((opt_prt & PRNT_AUTO) && has_stats(cltproc4info)))
                                print_callstats(
                                nfsv3name, cltproc3info + 1, sizeof(nfsv3name)/sizeof(char *)
                                );
                        if ((opt_prt & PRNT_V4) || ((opt_prt & PRNT_AUTO) && has_stats(cltproc4info)))
                                print_callstats(

-                               "Client nfs v4:\n",
+                               LABEL_cltproc4,

                                nfscltproc4name, cltproc4info + 1,  sizeof(nfscltproc4name)/sizeof(char *)
                                );
                }
                                nfscltproc4name, cltproc4info + 1,  sizeof(nfscltproc4name)/sizeof(char *)
                                );
                }


@@ -634,8 +650,11 @@ mounts(const char *name)
 }
 
 static void
 }
 
 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);
        if (!parse_statfile(file, info)) {
                if (!other_opt) {
                        fprintf(stderr, "Warning: No %s Stats (%s: %m). \n", label, file);


@@ -662,9 +681,9 @@ has_stats(const unsigned int *info)
  * and store the results back into 'new'
  */
 static void
  * 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
 
        /*
         * Different stat types have different formats in the /proc


@@ -675,7 +694,6 @@ diff_stats(struct statinfo *new, struct statinfo *old)
         * procX types ("i" < 2 for clt, < 4 for srv), or if it's not
         * the first entry ("j" > 0).
         */
         * 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++) {
        nodiff_first_index = 2 + (2 * is_srv);
 
        for (i = 0; old[i].tag; i++) {