nfsidmap: Added Error Logging

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

diff --git a/utils/nfsstat/nfsstat.c b/utils/nfsstat/nfsstat.c
index bacef8e8353402b2136e4fef098b4f41d5a39e0b..70f8d103fa022ec893ddc21c5d87c524490f4b6e 100644 (file)
--- a/utils/nfsstat/nfsstat.c
+++ b/utils/nfsstat/nfsstat.c
@@ -46,7 +46,7 @@ static unsigned int   cltproc3info[CLTPROC3_SZ+2],
 static unsigned int    srvproc4info[SRVPROC4_SZ+2],
                        srvproc4info_old[SRVPROC4_SZ+2];        /* NFSv4 call counts ([0] == 2) */
 static unsigned int    cltproc4info[CLTPROC4_SZ+2],
-                       cltproc4info_old[CLTPROC4_SZ+2];        /* NFSv4 call counts ([0] == 48) */
+                       cltproc4info_old[CLTPROC4_SZ+2];        /* NFSv4 call counts ([0] == 49) */
 static unsigned int    srvproc4opsinfo[SRVPROC4OPS_SZ+2],
                        srvproc4opsinfo_old[SRVPROC4OPS_SZ+2];  /* NFSv4 call counts ([0] == 59) */
 static unsigned int    srvnetinfo[5], srvnetinfo_old[5];       /* 0  # of received packets
@@ -118,7 +118,7 @@ static const char * nfscltproc4name[CLTPROC4_SZ] = {
        "remove",    "rename",    "link",    "symlink",     "create",      "pathconf",
        "statfs",    "readlink",  "readdir", "server_caps", "delegreturn", "getacl",
        "setacl",    "fs_locations",
-       "rel_lkowner",
+       "rel_lkowner", "secinfo",
        /* nfsv4.1 client ops */
        "exchange_id",
        "create_ses",
@@ -127,13 +127,10 @@ static const char *       nfscltproc4name[CLTPROC4_SZ] = {
        "get_lease_t",
        "reclaim_comp",
        "layoutget",
+       "getdevinfo",
        "layoutcommit",
        "layoutreturn",
        "getdevlist",
-       "getdevinfo",
-       /* nfsv4.1 pnfs client ops to data server only */
-       "ds_write",
-       "ds_commit",
 };
 
 static const char *     nfssrvproc4opname[SRVPROC4OPS_SZ] = {
@@ -221,8 +218,8 @@ DECLARE_CLT(cltinfo);
 DECLARE_CLT(cltinfo, _old);
 
 static void            print_all_stats(int, int, int);
-static void            print_server_stats(int, int);
-static void            print_client_stats(int, int);
+static void            print_server_stats(int);
+static void            print_client_stats(int);
 static void            print_stats_list(int, int, int);
 static void            print_numbers(const char *, unsigned int *,
                                        unsigned int);
@@ -239,7 +236,7 @@ static int          mounts(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 *, int);
 static int             has_rpcstats(const unsigned int *, int);
 static void            diff_stats(struct statinfo *, struct statinfo *, int);
 static void            unpause(int);
@@ -468,7 +465,7 @@ main(int argc, char **argv)
                pause();
        }
 
-       if (opt_since || opt_sleep) {
+       if (opt_since || (opt_sleep && !sleep_time)) {
                if (opt_srv) {
                        get_stats(NFSSRVSTAT, serverinfo_tmp, &opt_srv, opt_clt, 1);
                        diff_stats(serverinfo_tmp, serverinfo, 1);
@@ -516,16 +513,16 @@ main(int argc, char **argv)
 static void
 print_all_stats (int opt_srv, int opt_clt, int opt_prt)
 {
-       print_server_stats(opt_srv, opt_prt);
-       print_client_stats(opt_clt, opt_prt);
+       if (opt_srv)
+               print_server_stats(opt_prt);
+
+       if (opt_clt)
+               print_client_stats(opt_prt);
 }
 
 static void 
-print_server_stats(int opt_srv, int opt_prt) 
+print_server_stats(int opt_prt) 
 {
-       if (!opt_srv)
-               return;
-
        if (opt_prt & PRNT_NET) {
                if (opt_sleep && !has_rpcstats(srvnetinfo, 4)) {
                } else {
@@ -540,7 +537,7 @@ print_server_stats(int opt_srv, int opt_prt)
                        ;
                } else {
                        print_numbers(LABEL_srvrpc
-                               "calls      badcalls   badauth    badclnt    xdrcall\n",
+                               "calls      badcalls   badclnt    badauth    xdrcall\n",
                                srvrpcinfo, 5);
                        printf("\n");
                }
@@ -582,31 +579,29 @@ print_server_stats(int opt_srv, int opt_prt)
                printf("\n");
        }
        if (opt_prt & PRNT_CALLS) {
+               int has_v2_stats = has_stats(srvproc2info, SRVPROC2_SZ+2);
+               int has_v3_stats = has_stats(srvproc3info, SRVPROC3_SZ+2);
+               int has_v4_stats = has_stats(srvproc4info, SRVPROC4_SZ+2);
+
                if ((opt_prt & PRNT_V2) || 
-                               ((opt_prt & PRNT_AUTO) && has_stats(srvproc2info))) {
-                       if (opt_sleep && !has_stats(srvproc2info)) {
-                               ;
-                       } else {
+                               ((opt_prt & PRNT_AUTO) && has_v2_stats)) {
+                       if (!opt_sleep || has_v2_stats) {
                                print_callstats(LABEL_srvproc2,
                                        nfsv2name, srvproc2info + 1, 
                                        sizeof(nfsv2name)/sizeof(char *));
                        }
                }
                if ((opt_prt & PRNT_V3) || 
-                               ((opt_prt & PRNT_AUTO) && has_stats(srvproc3info))) {
-                       if (opt_sleep && !has_stats(srvproc3info)) {
-                               ;
-                       } else {
+                               ((opt_prt & PRNT_AUTO) && has_v3_stats)) {
+                       if (!opt_sleep || has_v3_stats) {
                                print_callstats(LABEL_srvproc3,
                                        nfsv3name, srvproc3info + 1, 
                                        sizeof(nfsv3name)/sizeof(char *));
                        }
                }
                if ((opt_prt & PRNT_V4) || 
-                               ((opt_prt & PRNT_AUTO) && has_stats(srvproc4info))) {
-                       if (opt_sleep && !has_stats(srvproc4info)) {
-                               ;
-                       } else {
+                               ((opt_prt & PRNT_AUTO) && has_v4_stats)) {
+                       if (!opt_sleep || has_v4_stats) {
                                print_callstats( LABEL_srvproc4,
                                        nfssrvproc4name, srvproc4info + 1, 
                                        sizeof(nfssrvproc4name)/sizeof(char *));
@@ -618,11 +613,8 @@ print_server_stats(int opt_srv, int opt_prt)
        }
 }
 static void
-print_client_stats(int opt_clt, int opt_prt) 
+print_client_stats(int opt_prt) 
 {
-       if (!opt_clt)
-               return;
-
        if (opt_prt & PRNT_NET) {
                if (opt_sleep && !has_rpcstats(cltnetinfo, 4)) {
                        ;
@@ -644,31 +636,28 @@ print_client_stats(int opt_clt, int opt_prt)
                }
        }
        if (opt_prt & PRNT_CALLS) {
+               int has_v2_stats = has_stats(cltproc2info, CLTPROC2_SZ+2);
+               int has_v3_stats = has_stats(cltproc3info, CLTPROC3_SZ+2);
+               int has_v4_stats = has_stats(cltproc4info, CLTPROC4_SZ+2);
                if ((opt_prt & PRNT_V2) || 
-                               ((opt_prt & PRNT_AUTO) && has_stats(cltproc2info))) {
-                       if (opt_sleep && !has_stats(cltproc2info)) {
-                               ;
-                       } else {
+                               ((opt_prt & PRNT_AUTO) && has_v2_stats)) {
+                       if (!opt_sleep || has_v2_stats) {
                                print_callstats(LABEL_cltproc2,
                                        nfsv2name, cltproc2info + 1,  
                                        sizeof(nfsv2name)/sizeof(char *));
                        }
                }
                if ((opt_prt & PRNT_V3) || 
-                               ((opt_prt & PRNT_AUTO) && has_stats(cltproc3info))) {
-                       if (opt_sleep && !has_stats(cltproc3info)) {
-                               ;
-                       } else {
+                               ((opt_prt & PRNT_AUTO) && has_v3_stats)) {
+                       if (!opt_sleep || has_v3_stats) {
                                print_callstats(LABEL_cltproc3,
                                        nfsv3name, cltproc3info + 1, 
                                        sizeof(nfsv3name)/sizeof(char *));
                        }
                }
                if ((opt_prt & PRNT_V4) || 
-                               ((opt_prt & PRNT_AUTO) && has_stats(cltproc4info))) {
-                       if (opt_sleep && !has_stats(cltproc4info)) {
-                               ;
-                       } else {
+                               ((opt_prt & PRNT_AUTO) && has_v4_stats)) {
+                       if (!opt_sleep || has_v4_stats) {
                                print_callstats(LABEL_cltproc4,
                                        nfscltproc4name, cltproc4info + 1,  
                                        sizeof(nfscltproc4name)/sizeof(char *));
@@ -681,34 +670,28 @@ static void
 print_clnt_list(int opt_prt) 
 {
        if (opt_prt & PRNT_CALLS) {
+               int has_v2_stats = has_stats(cltproc2info, CLTPROC2_SZ+2);
+               int has_v3_stats = has_stats(cltproc3info, CLTPROC3_SZ+2);
+               int has_v4_stats = has_stats(cltproc4info, CLTPROC4_SZ+2);
                if ((opt_prt & PRNT_V2) || 
-                               ((opt_prt & PRNT_AUTO) && has_stats(cltproc2info))) {
-                       if (opt_sleep && !has_stats(cltproc2info)) {
-                               ;
-                       } else {
+                               ((opt_prt & PRNT_AUTO) && has_v2_stats)) {
+                       if (!opt_sleep || has_v2_stats) {
                                print_callstats_list("nfs v2 client",
                                        nfsv2name, cltproc2info + 1,  
                                        sizeof(nfsv2name)/sizeof(char *));
                        }
                }
                if ((opt_prt & PRNT_V3) || 
-                               ((opt_prt & PRNT_AUTO) && has_stats(cltproc3info))) {
-                       if (opt_sleep && !has_stats(cltproc3info)) {
-                               ;
-                       } else { 
+                               ((opt_prt & PRNT_AUTO) && has_v3_stats)) {
+                       if (!opt_sleep || has_v3_stats) {
                                print_callstats_list("nfs v3 client",
                                        nfsv3name, cltproc3info + 1, 
                                        sizeof(nfsv3name)/sizeof(char *));
                        }
                }
                if ((opt_prt & PRNT_V4) || 
-                               ((opt_prt & PRNT_AUTO) && has_stats(cltproc4info))) {
-                       if (opt_sleep && !has_stats(cltproc4info)) {
-                               ;
-                       } else {
-                               print_callstats_list("nfs v4 ops",
-                                       nfssrvproc4opname, srvproc4opsinfo + 1, 
-                                       sizeof(nfssrvproc4opname)/sizeof(char *));
+                               ((opt_prt & PRNT_AUTO) && has_v4_stats)) {
+                       if (!opt_sleep || has_v4_stats) {
                                print_callstats_list("nfs v4 client",
                                        nfscltproc4name, cltproc4info + 1,  
                                        sizeof(nfscltproc4name)/sizeof(char *));
@@ -720,32 +703,32 @@ static void
 print_serv_list(int opt_prt) 
 {
        if (opt_prt & PRNT_CALLS) {
+               int has_v2_stats = has_stats(srvproc2info, SRVPROC2_SZ+2);
+               int has_v3_stats = has_stats(srvproc3info, SRVPROC3_SZ+2);
+               int has_v4_stats = has_stats(srvproc4info, SRVPROC4_SZ+2);
                if ((opt_prt & PRNT_V2) || 
-                               ((opt_prt & PRNT_AUTO) && has_stats(srvproc2info))) {
-                       if (opt_sleep && !has_stats(srvproc2info)) {
-                               ;
-                       } else {
+                               ((opt_prt & PRNT_AUTO) && has_v2_stats)) {
+                       if (!opt_sleep || has_v2_stats) {
                                print_callstats_list("nfs v2 server",
                                        nfsv2name, srvproc2info + 1, 
                                        sizeof(nfsv2name)/sizeof(char *));
                        }
                }
                if ((opt_prt & PRNT_V3) || 
-                               ((opt_prt & PRNT_AUTO) && has_stats(srvproc3info))) {
-                       if (opt_sleep && !has_stats(srvproc3info)) {
-                               ;
-                       } else {
+                               ((opt_prt & PRNT_AUTO) && has_v3_stats)) {
+                       if (!opt_sleep || has_v3_stats) {
                                print_callstats_list("nfs v3 server",
                                        nfsv3name, srvproc3info + 1, 
                                        sizeof(nfsv3name)/sizeof(char *));
                        }
                }
                if ((opt_prt & PRNT_V4) || 
-                               ((opt_prt & PRNT_AUTO) && has_stats(srvproc4opsinfo))) {
-                       if (opt_sleep && !has_stats(srvproc4info)) {
-                               ;
-                       } else {
-                               print_callstats_list("nfs v4 ops",
+                               ((opt_prt & PRNT_AUTO) && has_v4_stats)) {
+                       if (!opt_sleep || has_v4_stats) {
+                               print_callstats_list("nfs v4 server",
+                                       nfssrvproc4name, srvproc4info + 1, 
+                                       sizeof(nfssrvproc4name)/sizeof(char *));
+                               print_callstats_list("nfs v4 servop",
                                        nfssrvproc4opname, srvproc4opsinfo + 1, 
                                        sizeof(nfssrvproc4opname)/sizeof(char *));
                        }
@@ -1054,9 +1037,9 @@ out:
  * there are stats if the sum's greater than the entry-count.
  */
 static int
-has_stats(const unsigned int *info)
+has_stats(const unsigned int *info, int nr)
 {
-       return (info[0] && info[info[0] + 1] > info[0]);
+       return (info[0] && info[nr-1] > info[0]);
 }
 static int
 has_rpcstats(const unsigned int *info, int size)