nfsstat.c: Print diff stats every N seconds
Subsystems (2)
PATCH 1/2 nfsstat.c: Print diff stats every N seconds
nfsstat.c: Implemented --sleep[interval] option. nfsstat.man: Added information about the --sleep option
--- utils/nfsstat/nfsstat.c | 158 +++++++++++++++++++++++++++++++++++++-------- utils/nfsstat/nfsstat.man | 6 ++- 2 files changed, 137 insertions(+), 27 deletions(-)
utils/nfsstat/nfsstat.c +132 -26
@@ -167,10 +167,16 @@ DECLARE_SRV(srvinfo, _old);DECLARE_CLT (cltinfo);DECLARE_CLT (cltinfo, _old); +static void print_server_stats (int ,int ); +static void print_client_stats (int ,int ); +static void print_stats_list (int );static void print_numbers (const char *,unsigned int *,unsigned int );static void print_callstats (const char *,const char **,unsigned int *,unsigned int ); +static void print_callstats_list (const char *,const char **, +unsigned int *,unsigned int *, +unsigned int );static int parse_raw_statfile (const char *,struct statinfo *);static int parse_pretty_statfile (const char *,struct statinfo *);
@@ -183,6 +189,7 @@ static void get_stats(const char *, struct statinfo *, int *, int,static int has_stats (const unsigned int *);static void diff_stats (struct statinfo *,struct statinfo *,int );static void unpause (int ); +static void update_old_counters (struct statinfo *,struct statinfo *);static time_t starttime;
@@ -207,26 +214,29 @@ void usage(char *name) {printf ("Usage: %s [OPTION]...\n\ \n\ --m, --mounts\t\tShow statistics on mounted NFS filesystems\n\ --c, --client\t\tShow NFS client statistics\n\ --s, --server\t\tShow NFS server statistics\n\ --2\t\t\tShow NFS version 2 statistics\n\ --3\t\t\tShow NFS version 3 statistics\n\ --4\t\t\tShow NFS version 4 statistics\n\ --o [facility]\t\tShow statistics on particular facilities.\n\ -nfs\tNFS protocol information\n\ -rpc\tGeneral RPC information\n\ -net\tNetwork layer statistics\n\ -fh\t\tUsage information on the server's file handle cache\n\ -rc\t\tUsage information on the server's request reply cache\n\ -all\tSelect all of the above\n\ --v, --verbose, --all\tSame as '-o all'\n\ --r, --rpc\t\tShow RPC statistics\n\ --n, --nfs\t\tShow NFS statistics\n\ --Z, --sleep\t\tSaves stats, pauses, diffs current and saved\n\ --S, --since file\tShows difference between current stats and those in 'file'\n\ ---version\t\tShow program version\n\ ---help\t\tWhat you just did\n\ +-m, --mounts Show statistics on mounted NFS filesystems\n\ +-c, --client Show NFS client statistics\n\ +-s, --server Show NFS server statistics\n\ +-2 Show NFS version 2 statistics\n\ +-3 Show NFS version 3 statistics\n\ +-4 Show NFS version 4 statistics\n\ +-o [facility] Show statistics on particular facilities.\n\ +nfs NFS protocol information\n\ +rpc General RPC information\n\ +net Network layer statistics\n\ +fh Usage information on the server's file handle cache\n\ +rc Usage information on the server's request reply cache\n\ +all Select all of the above\n\ +-v, --verbose, --all Same as '-o all'\n\ +-r, --rpc Show RPC statistics\n\ +-n, --nfs Show NFS statistics\n\ +-Z[#], --sleep[=#] Collects stats until interrupted.\n\ +Cumulative stats are then printed\n\ +If # is provided, stats will be output every\n\ +# seconds.\n\ +-S, --since file Shows difference between current stats and those in 'file'\n\ +--version Show program version\n\ +--help What you just did\n\ \n" , name);exit (0 ); }
@@ -245,7 +255,7 @@ static struct option longopts[] = { "zero", 0, 0, 'z' }, { "help", 0, 0, '\1' }, { "version", 0, 0, '\2' }, - { "sleep", 0, 0, 'Z' }, + { "sleep", 2, 0, 'Z' }, { "since", 1, 0, 'S' }, { NULL, 0, 0, 0 } };
@@ -258,6 +268,7 @@ main(int argc, char **argv) opt_clt =0 , opt_prt =0 , opt_sleep =0 , + sleep_time =0 , opt_since =0 ;int c; char *progname,
@@ -279,7 +290,7 @@ main(int argc, char **argv)else progname = argv[0 ]; -while ((c =getopt_long (argc, argv,"234acmno:ZS:vrsz\1\2" , longopts,NULL )) !=EOF ) { +while ((c =getopt_long (argc, argv,"234acmno:Z::S:vrsz\1\2" , longopts,NULL )) !=EOF ) {switch (c) {case 'a' :fprintf (stderr,"nfsstat: nfs acls are not yet supported.\n" );
@@ -311,6 +322,9 @@ main(int argc, char **argv)break ;case 'Z' : opt_sleep =1 ; +if (optarg) { + sleep_time =atoi (optarg); + }break ;case 'S' : opt_since =1 ;
@@ -384,7 +398,7 @@ main(int argc, char **argv)if (opt_clt)get_stats (clientfile, clientinfo, &opt_clt, opt_srv,0 ); -if (opt_sleep) { +if (opt_sleep && !sleep_time) { starttime =time (NULL );printf ("Collecting statistics; press CTRL-C to view results from interval (i.e., from pause to CTRL-C).\n" );if (sigaction (SIGINT , &act,NULL ) !=0 ) {
@@ -404,7 +418,33 @@ main(int argc, char **argv)diff_stats (clientinfo_tmp, clientinfo,0 ); } } +if (sleep_time) { +while (1 ) { +if (opt_srv) { +get_stats (NFSSRVSTAT , serverinfo_tmp , &opt_srv, opt_clt,1 ); +diff_stats (serverinfo_tmp, serverinfo,1 ); + } +if (opt_clt) { +get_stats (NFSCLTSTAT , clientinfo_tmp, &opt_clt, opt_srv,0 ); +diff_stats (clientinfo_tmp, clientinfo,0 ); + } +print_stats_list (opt_prt); +fflush (stdout); + +update_old_counters (clientinfo_tmp, clientinfo); +sleep (sleep_time); + } + }else { +print_server_stats (opt_srv, opt_prt); +print_client_stats (opt_clt, opt_prt); + } + +return 0 ; +} +static void +print_server_stats (int opt_srv,int opt_prt) +{if (opt_srv) {if (opt_prt &PRNT_NET ) { print_numbers(
@@ -479,7 +519,10 @@ main(int argc, char **argv) } } } - +} +static void +print_client_stats (int opt_clt,int opt_prt) +{if (opt_clt) {if (opt_prt &PRNT_NET ) { print_numbers(
@@ -515,10 +558,43 @@ main(int argc, char **argv) ); } } - -return 0 ; } +static void +print_stats_list (int opt_prt) +{ +if (opt_prt &PRNT_CALLS ) { +if ((opt_prt &PRNT_V2 ) || ((opt_prt &PRNT_AUTO ) &&has_stats (cltproc2info))) +print_callstats_list ( +"nfs v2 stats:" , + nfsv2name, srvproc2info +1 , cltproc2info +1 , +sizeof (nfsv2name)/sizeof (char *) + ); +printf ("\n" ); +if ((opt_prt &PRNT_V3 ) || ((opt_prt &PRNT_AUTO ) &&has_stats (cltproc3info))) +print_callstats_list ( +"nfs v3 stats:" , + nfsv3name, srvproc3info +1 , cltproc3info +1 , +sizeof (nfsv3name)/sizeof (char *) + ); +printf ("\n" ); +if ((opt_prt &PRNT_V4 ) || ((opt_prt &PRNT_AUTO ) &&has_stats (cltproc4info))) { +print_callstats ( + LABEL_srvproc4, + nfssrvproc4name, srvproc4info +1 ,sizeof (nfssrvproc4name)/sizeof (char *) + ); +print_callstats ( + LABEL_srvproc4ops, + nfssrvproc4opname, srvproc4opsinfo +1 ,sizeof (nfssrvproc4opname)/sizeof (char *) + ); +print_callstats ( + LABEL_cltproc4, + nfscltproc4name, cltproc4info +1 ,sizeof (nfscltproc4name)/sizeof (char *) + ); + } + } +} +static statinfo *get_stat_info (const char *sp,struct statinfo *statp) {
@@ -569,6 +645,26 @@ print_callstats(const char *hdr, const char **names,printf ("\n" ); } +static void +print_callstats_list (const char *hdr,const char **names, +unsigned int *srvinfo,unsigned int *cltinfo, +unsigned int nr) +{ +unsigned long long srvtotal, clttotal; +int i; + +for (i =0 , srvtotal =0 , clttotal =0 ; i < nr; i++) { + srvtotal += srvinfo[i]; + clttotal += cltinfo[i]; + } +printf ("%13s %8s %8s\n" , hdr,"Server" ,"Client" ); +printf ("%12s: %8llu %8llu \n" ,"total" , srvtotal, clttotal); +for (i =0 ; i < nr; i++) { +printf ("%12s: %8u %8u \n" , names[i], srvinfo[i], cltinfo[i]); + } + +} +/* returns 0 on success, 1 otherwise */ static int parse_raw_statfile (const char *name,struct statinfo *statp)
@@ -846,3 +942,13 @@ unpause(int sig) seconds = (int )time_diff %60 ;printf ("Signal received; displaying (only) statistics gathered over the last %d minutes, %d seconds:\n\n" , minutes, seconds); } + +static void +update_old_counters (struct statinfo *new,struct statinfo *old) +{ +int z, i; +for (z =0 ; old[z].tag; z++) +for (i =0 ; i <= old[z].nrvals; i++) + old[z].valptr[i] += new[z].valptr[i]; + +}
utils/nfsstat/nfsstat.man +5 -1
@@ -91,7 +91,7 @@ output .I file are treated as zeroes. .TP -.B \-Z, \-\-sleep +.B \-Z[interval], \-\-sleep=[interval] Instead of printing current statistics and immediately exiting, .B nfsstat takes a snapshot of the current statistics and pauses until it receives
@@ -100,6 +100,10 @@ takes a snapshot of the current statistics and pauses until it receives .BR Ctrl-C ), at which point it takes another snapshot and displays the difference between the two. +If \fIinterval\fR is specified, +.B nfsstat +will print the number of \fBNFS\fR calls made since the previous report. +Stats will be printed repeatedly every \fIinterval\fR seconds. .\" --------------------- EXAMPLES ------------------------------- .SH EXAMPLES .TP
Signature · 1 line
1.6.0.4.761.g47577
A message that is not in the archive (sent off-list or not yet received): 1237225556-27691-1-git-send-email-kevin.constantine-FfNkGbSheRGpB8w63BLUukEOCMrvLtNR@public.gmane.org
PATCH 2/2 nfsstat: Add --list flag
nfsstat.c: Adds the --list flag to print information in a list format instead of the standard multi-column format nfsstat.man: Updates the manpage to include the --list flag.
--- utils/nfsstat/nfsstat.c | 87 ++++++++++++++++++++++++++++++-------------- utils/nfsstat/nfsstat.man | 3 ++ 2 files changed, 62 insertions(+), 28 deletions(-)
utils/nfsstat/nfsstat.c +59 -28
@@ -176,7 +176,7 @@ static void print_callstats(const char *, const char **, unsigned int *, unsigned int);static void print_callstats_list (const char *,const char **,unsigned int *,unsigned int *, -unsigned int ); +unsigned int ,unsigned int );static int parse_raw_statfile (const char *,struct statinfo *);static int parse_pretty_statfile (const char *,struct statinfo *);
@@ -257,6 +257,7 @@ static struct option longopts[] = { "version", 0, 0, '\2' }, { "sleep", 2, 0, 'Z' }, { "since", 1, 0, 'S' }, + { "list", 0, 0, 'l' }, { NULL, 0, 0, 0 } };
@@ -269,6 +270,7 @@ main(int argc, char **argv) opt_prt =0 , opt_sleep =0 , sleep_time =0 , + opt_list =0 , opt_since =0 ;int c; char *progname,
@@ -290,7 +292,7 @@ main(int argc, char **argv)else progname = argv[0 ]; -while ((c =getopt_long (argc, argv,"234acmno:Z::S:vrsz\1\2" , longopts,NULL )) !=EOF ) { +while ((c =getopt_long (argc, argv,"234acmno:Z::S:vrszl\1\2" , longopts,NULL )) !=EOF ) {switch (c) {case 'a' :fprintf (stderr,"nfsstat: nfs acls are not yet supported.\n" );
@@ -348,6 +350,9 @@ main(int argc, char **argv)case 's' : opt_srv =1 ;break ; +case 'l' : + opt_list =1 ; +break ;case 'z' :fprintf (stderr,"nfsstat: zeroing of nfs statistics " "not yet supported\n" );
@@ -428,15 +433,24 @@ main(int argc, char **argv)get_stats (NFSCLTSTAT , clientinfo_tmp, &opt_clt, opt_srv,0 );diff_stats (clientinfo_tmp, clientinfo,0 ); } -print_stats_list (opt_prt); +if (opt_list) { +print_stats_list (opt_prt); + }else { +print_server_stats (opt_srv, opt_prt); +print_client_stats (opt_clt, opt_prt); + }fflush (stdout);update_old_counters (clientinfo_tmp, clientinfo);sleep (sleep_time); } }else { -print_server_stats (opt_srv, opt_prt); -print_client_stats (opt_clt, opt_prt); +if (opt_list) { +print_stats_list (opt_prt); + }else { +print_server_stats (opt_srv, opt_prt); +print_client_stats (opt_clt, opt_prt); + } }return 0 ;
@@ -568,29 +582,31 @@ print_stats_list(int opt_prt)print_callstats_list ("nfs v2 stats:" , nfsv2name, srvproc2info +1 , cltproc2info +1 , -sizeof (nfsv2name)/sizeof (char *) +sizeof (nfsv2name)/sizeof (char *),2 );printf ("\n" );if ((opt_prt &PRNT_V3 ) || ((opt_prt &PRNT_AUTO ) &&has_stats (cltproc3info)))print_callstats_list ("nfs v3 stats:" , nfsv3name, srvproc3info +1 , cltproc3info +1 , -sizeof (nfsv3name)/sizeof (char *) +sizeof (nfsv3name)/sizeof (char *),3 );printf ("\n" );if ((opt_prt &PRNT_V4 ) || ((opt_prt &PRNT_AUTO ) &&has_stats (cltproc4info))) { -print_callstats ( - LABEL_srvproc4, - nfssrvproc4name, srvproc4info +1 ,sizeof (nfssrvproc4name)/sizeof (char *) - ); -print_callstats ( - LABEL_srvproc4ops, - nfssrvproc4opname, srvproc4opsinfo +1 ,sizeof (nfssrvproc4opname)/sizeof (char *) - ); -print_callstats ( - LABEL_cltproc4, - nfscltproc4name, cltproc4info +1 ,sizeof (nfscltproc4name)/sizeof (char *) - ); +/* Pass 0 as the clientproc#info to avoid having to write a whole new function +to handle nfsv4 since the client server calls aren't named the same */ +print_callstats_list ( + LABEL_srvproc4, + nfssrvproc4name, srvproc4info +1 ,0 ,sizeof (nfssrvproc4name)/sizeof (char *),4 + ); +print_callstats_list ( + LABEL_srvproc4ops, + nfssrvproc4opname, srvproc4opsinfo +1 ,0 ,sizeof (nfssrvproc4opname)/sizeof (char *),4 + ); +print_callstats_list ( + LABEL_cltproc4, + nfscltproc4name, cltproc4info +1 ,0 ,sizeof (nfscltproc4name)/sizeof (char *),4 + ); } } }
@@ -648,19 +664,34 @@ print_callstats(const char *hdr, const char **names,static void print_callstats_list (const char *hdr,const char **names,unsigned int *srvinfo,unsigned int *cltinfo, -unsigned int nr) +unsigned int nr,unsigned int nfsvers) {unsigned long long srvtotal, clttotal;int i; -for (i =0 , srvtotal =0 , clttotal =0 ; i < nr; i++) { - srvtotal += srvinfo[i]; - clttotal += cltinfo[i]; - } -printf ("%13s %8s %8s\n" , hdr,"Server" ,"Client" ); -printf ("%12s: %8llu %8llu \n" ,"total" , srvtotal, clttotal); -for (i =0 ; i < nr; i++) { -printf ("%12s: %8u %8u \n" , names[i], srvinfo[i], cltinfo[i]); +if (nfsvers <4 ) { +for (i =0 , srvtotal =0 , clttotal =0 ; i < nr; i++) { + srvtotal += srvinfo[i]; + clttotal += cltinfo[i]; + } +printf ("%13s %8s %8s\n" , hdr,"Server" ,"Client" ); +printf ("%12s: %8llu %8llu \n" ,"total" , srvtotal, clttotal); +for (i =0 ; i < nr; i++) { +printf ("%12s: %8u %8u \n" , names[i], srvinfo[i], cltinfo[i]); + } + }else { +/* nfsv4's client and server calls aren't named the same, so we'll print them out +* separately. Everything will be passed in as srvinfo. Ignore cltinfo which +* will be passed in as 0 +*/ +for (i =0 , srvtotal =0 ; i < nr; i++) + srvtotal += srvinfo[i]; +printf ("%13s %8s\n" , hdr,"Calls" ); +printf ("%12s: %8llu \n" ,"total" , srvtotal); +for (i =0 ; i < nr; i++) { +printf ("%12s: %8u \n" , names[i], srvinfo[i]); + } +printf ("\n" ); } }
utils/nfsstat/nfsstat.man +3 -0
@@ -72,6 +72,9 @@ Display all of the above facilities. .B \-v, \-\-verbose This is equivalent to \fB\-o all\fR. .TP +.B \-l, \-\-list +Print information in list form. +.TP .BI "\-S, \-\-since " file Instead of printing current statistics, .B nfsstat
Signature · 1 line
1.6.0.4.761.g47577
A message that is not in the archive (sent off-list or not yet received): 1237225556-27691-2-git-send-email-kevin.constantine-FfNkGbSheRGpB8w63BLUukEOCMrvLtNR@public.gmane.org
Re: [PATCH 2/2] nfsstat: Add --list flag
utils/nfsstat/nfsstat.c main(int argc, char **argv)
Quoted 18 lines · Kevin Constantine
nfsstat.c: Adds the --list flag to print information in a list format instead of the standard multi-column format nfsstat.man: Updates the manpage to include the --list flag.--- utils/nfsstat/nfsstat.c | 87 ++++++++++++++++++++++++++++++-------------- utils/nfsstat/nfsstat.man | 3 ++ 2 files changed, 62 insertions(+), 28 deletions(-)utils/nfsstat/nfsstat.c +0
-0@@ -176,7 +176,7 @@ static void print_callstats(const char *, const char **,@@ -257,6 +257,7 @@ static struct option longopts[] =@@ -269,6 +270,7 @@ main(int argc, char **argv)@@ -290,7 +292,7 @@ main(int argc, char **argv)@@ -348,6 +350,9 @@ main(int argc, char **argv)
Looks good.
Quoted 18 lines
utils/nfsstat/nfsstat.c +6
-2@@ -428,15 +433,24 @@ main(int argc, char **argv)get_stats (NFSCLTSTAT , clientinfo_tmp, &opt_clt, opt_srv,0 );diff_stats (clientinfo_tmp, clientinfo,0 ); } -print_stats_list (opt_prt); +if (opt_list) { +print_stats_list (opt_prt); + }else { +print_server_stats (opt_srv, opt_prt); +print_client_stats (opt_clt, opt_prt); + }fflush (stdout);update_old_counters (clientinfo_tmp, clientinfo);sleep (sleep_time); } }else { -print_server_stats (opt_srv, opt_prt);
utils/nfsstat/nfsstat.c main(int argc, char **argv) · line 456
Quoted 10 lines
utils/nfsstat/nfsstat.c +6
-1-print_client_stats (opt_clt, opt_prt); +if (opt_list) { +print_stats_list (opt_prt); + }else { +print_server_stats (opt_srv, opt_prt); +print_client_stats (opt_clt, opt_prt); + } }
The logic is good here. The code might have been marginally cleaner if those 6 lines which are now duplicated were pushed into a function.
Quoted 35 lines
utils/nfsstat/nfsstat.c +16
-9return 0 ;@@ -568,29 +582,31 @@ print_stats_list(int opt_prt)@@ -648,19 +664,34 @@ print_callstats(const char *hdr, const char **names,static void print_callstats_list (const char *hdr,const char **names,unsigned int *srvinfo,unsigned int *cltinfo, -unsigned int nr) +unsigned int nr,unsigned int nfsvers) {unsigned long long srvtotal, clttotal;int i; -for (i =0 , srvtotal =0 , clttotal =0 ; i < nr; i++) { - srvtotal += srvinfo[i]; - clttotal += cltinfo[i]; - } -printf ("%13s %8s %8s\n" , hdr,"Server" ,"Client" ); -printf ("%12s: %8llu %8llu \n" ,"total" , srvtotal, clttotal); -for (i =0 ; i < nr; i++) { -printf ("%12s: %8u %8u \n" , names[i], srvinfo[i], cltinfo[i]); +if (nfsvers <4 ) { +for (i =0 , srvtotal =0 , clttotal =0 ; i < nr; i++) { + srvtotal += srvinfo[i]; + clttotal += cltinfo[i]; + } +printf ("%13s %8s %8s\n" , hdr,"Server" ,"Client" ); +printf ("%12s: %8llu %8llu \n" ,"total" , srvtotal, clttotal); +for (i =0 ; i < nr; i++) { +printf ("%12s: %8u %8u \n" , names[i], srvinfo[i], cltinfo[i]); + } + }else { +/* nfsv4's client and server calls aren't named the same, so we'll print them out +* separately. Everything will be passed in as srvinfo. Ignore cltinfo which +* will be passed in as 0 +*/
utils/nfsstat/nfsstat.c print_callstats(const char *hdr, const char **names, · line 696
Quoted 10 lines
utils/nfsstat/nfsstat.c +8
-0+for (i =0 , srvtotal =0 ; i < nr; i++) + srvtotal += srvinfo[i]; +printf ("%13s %8s\n" , hdr,"Calls" ); +printf ("%12s: %8llu \n" ,"total" , srvtotal); +for (i =0 ; i < nr; i++) { +printf ("%12s: %8u \n" , names[i], srvinfo[i]); + } +printf ("\n" ); }
Maybe you can smooth out this difference, and make the code simpler and cleaner, by making the output always be exactly two columns, one for the label and one for the value. Then your earlier quoted example would be something like
nfs v3 client total: 213
nfs v3 client null: 0
nfs v3 client getattr: 23
nfs v3 client setattr: 9
nfs v3 client lookup: 8
nfs v3 client access: 1
nfs v3 client readlink: 0
nfs v3 client read: 7
nfs v3 client write: 23
nfs v3 client create: 8
nfs v3 client mkdir: 0
nfs v3 client symlink: 0
nfs v3 client mknod: 0
nfs v3 client remove: 7
nfs v3 client rmdir: 0
nfs v3 client rename: 1
nfs v3 client link: 0
nfs v3 client readdir: 0
nfs v3 client readdirplus: 0
nfs v3 client fsstat: 126
nfs v3 client fsinfo: 0
nfs v3 client pathconf: 0
nfs v3 client commit: 0
nfs v3 server total: 0
nfs v3 server null: 0
nfs v3 server getattr: 0
nfs v3 server setattr: 0
nfs v3 server lookup: 0
nfs v3 server access: 0
nfs v3 server readlink: 0
nfs v3 server read: 0
nfs v3 server write: 0
nfs v3 server create: 0
nfs v3 server mkdir: 0
nfs v3 server symlink: 0
nfs v3 server mknod: 0
nfs v3 server remove: 0
nfs v3 server rmdir: 0
nfs v3 server rename: 0
nfs v3 server link: 0
nfs v3 server readdir: 0
nfs v3 server readdirplus: 0
nfs v3 server fsstat: 0
nfs v3 server fsinfo: 0
nfs v3 server pathconf: 0
nfs v3 server commit: 0Instead of
nfs v3 stats: Server Client
total: 0 213
null: 0 0
getattr: 0 23
setattr: 0 9
lookup: 0 8
access: 0 1
readlink: 0 0
read: 0 7
write: 0 23
create: 0 8
mkdir: 0 0
symlink: 0 0
mknod: 0 0
remove: 0 7
rmdir: 0 0
rename: 0 1
link: 0 0
readdir: 0 0
readdirplus: 0 0
fsstat: 0 126
fsinfo: 0 0
pathconf: 0 0
commit: 0 0 This would also help with your stated objective of being to grep the output.
utils/nfsstat/nfsstat.man Display all of the above facilities. · line 73
Quoted 9 lines
utils/nfsstat/nfsstat.c +0
-0}utils/nfsstat/nfsstat.man +0
-0@@ -72,6 +72,9 @@ Display all of the above facilities.
Looks good.
Signature · 3 lines
Greg Banks, P.Engineer, SGI Australian Software Group. the brightly coloured sporks of revolution. I don't speak for SGI.
PATCH 1/2 nfsstat: Print diff stats every N seconds
nfsstat.c: Implements an optional "interval" argument to --sleep nfsstat.man: Explains the use of --sleep[interval]
--- utils/nfsstat/nfsstat.c | 107 ++++++++++++++++++++++++++++++++++----------- utils/nfsstat/nfsstat.man | 6 ++- 2 files changed, 86 insertions(+), 27 deletions(-)
utils/nfsstat/nfsstat.c +81 -26
@@ -167,6 +167,9 @@ DECLARE_SRV(srvinfo, _old);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_numbers (const char *,unsigned int *,unsigned int ); static void print_callstats(const char *, const char **,
@@ -183,6 +186,7 @@ static void get_stats(const char *, struct statinfo *, int *, int,static int has_stats (const unsigned int *);static void diff_stats (struct statinfo *,struct statinfo *,int );static void unpause (int ); +static void update_old_counters (struct statinfo *,struct statinfo *);static time_t starttime;
@@ -207,26 +211,29 @@ void usage(char *name) {printf ("Usage: %s [OPTION]...\n\ \n\ --m, --mounts\t\tShow statistics on mounted NFS filesystems\n\ --c, --client\t\tShow NFS client statistics\n\ --s, --server\t\tShow NFS server statistics\n\ --2\t\t\tShow NFS version 2 statistics\n\ --3\t\t\tShow NFS version 3 statistics\n\ --4\t\t\tShow NFS version 4 statistics\n\ --o [facility]\t\tShow statistics on particular facilities.\n\ -nfs\tNFS protocol information\n\ -rpc\tGeneral RPC information\n\ -net\tNetwork layer statistics\n\ -fh\t\tUsage information on the server's file handle cache\n\ -rc\t\tUsage information on the server's request reply cache\n\ -all\tSelect all of the above\n\ --v, --verbose, --all\tSame as '-o all'\n\ --r, --rpc\t\tShow RPC statistics\n\ --n, --nfs\t\tShow NFS statistics\n\ --Z, --sleep\t\tSaves stats, pauses, diffs current and saved\n\ --S, --since file\tShows difference between current stats and those in 'file'\n\ ---version\t\tShow program version\n\ ---help\t\tWhat you just did\n\ +-m, --mounts Show statistics on mounted NFS filesystems\n\ +-c, --client Show NFS client statistics\n\ +-s, --server Show NFS server statistics\n\ +-2 Show NFS version 2 statistics\n\ +-3 Show NFS version 3 statistics\n\ +-4 Show NFS version 4 statistics\n\ +-o [facility] Show statistics on particular facilities.\n\ +nfs NFS protocol information\n\ +rpc General RPC information\n\ +net Network layer statistics\n\ +fh Usage information on the server's file handle cache\n\ +rc Usage information on the server's request reply cache\n\ +all Select all of the above\n\ +-v, --verbose, --all Same as '-o all'\n\ +-r, --rpc Show RPC statistics\n\ +-n, --nfs Show NFS statistics\n\ +-Z[#], --sleep[=#] Collects stats until interrupted.\n\ +Cumulative stats are then printed\n\ +If # is provided, stats will be output every\n\ +# seconds.\n\ +-S, --since file Shows difference between current stats and those in 'file'\n\ +--version Show program version\n\ +--help What you just did\n\ \n" , name);exit (0 ); }
@@ -245,7 +252,7 @@ static struct option longopts[] = { "zero", 0, 0, 'z' }, { "help", 0, 0, '\1' }, { "version", 0, 0, '\2' }, - { "sleep", 0, 0, 'Z' }, + { "sleep", 2, 0, 'Z' }, { "since", 1, 0, 'S' }, { NULL, 0, 0, 0 } };
@@ -258,6 +265,7 @@ main(int argc, char **argv) opt_clt =0 , opt_prt =0 , opt_sleep =0 , + sleep_time =0 , opt_since =0 ;int c; char *progname,
@@ -279,7 +287,7 @@ main(int argc, char **argv)else progname = argv[0 ]; -while ((c =getopt_long (argc, argv,"234acmno:ZS:vrsz\1\2" , longopts,NULL )) !=EOF ) { +while ((c =getopt_long (argc, argv,"234acmno:Z::S:vrsz\1\2" , longopts,NULL )) !=EOF ) {switch (c) {case 'a' :fprintf (stderr,"nfsstat: nfs acls are not yet supported.\n" );
@@ -311,6 +319,9 @@ main(int argc, char **argv)break ;case 'Z' : opt_sleep =1 ; +if (optarg) { + sleep_time =atoi (optarg); + }break ;case 'S' : opt_since =1 ;
@@ -384,7 +395,7 @@ main(int argc, char **argv)if (opt_clt)get_stats (clientfile, clientinfo, &opt_clt, opt_srv,0 ); -if (opt_sleep) { +if (opt_sleep && !sleep_time) { starttime =time (NULL );printf ("Collecting statistics; press CTRL-C to view results from interval (i.e., from pause to CTRL-C).\n" );if (sigaction (SIGINT , &act,NULL ) !=0 ) {
@@ -404,7 +415,40 @@ main(int argc, char **argv)diff_stats (clientinfo_tmp, clientinfo,0 ); } } +if (sleep_time) { +while (1 ) { +if (opt_srv) { +get_stats (NFSSRVSTAT , serverinfo_tmp , &opt_srv, opt_clt,1 ); +diff_stats (serverinfo_tmp, serverinfo,1 ); + } +if (opt_clt) { +get_stats (NFSCLTSTAT , clientinfo_tmp, &opt_clt, opt_srv,0 ); +diff_stats (clientinfo_tmp, clientinfo,0 ); + } +print_all_stats (opt_srv, opt_clt, opt_prt); +printf ("\n\n" ); +fflush (stdout); + +update_old_counters (clientinfo_tmp, clientinfo); +sleep (sleep_time); + } + }else { +print_all_stats (opt_srv, opt_clt, opt_prt); + } + +return 0 ; +} + +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); +} +static void +print_server_stats (int opt_srv,int opt_prt) +{if (opt_srv) {if (opt_prt &PRNT_NET ) { print_numbers(
@@ -479,7 +523,10 @@ main(int argc, char **argv) } } } - +} +static void +print_client_stats (int opt_clt,int opt_prt) +{if (opt_clt) {if (opt_prt &PRNT_NET ) { print_numbers(
@@ -515,8 +562,6 @@ main(int argc, char **argv) ); } } - -return 0 ; } static statinfo *
@@ -846,3 +891,13 @@ unpause(int sig) seconds = (int )time_diff %60 ;printf ("Signal received; displaying (only) statistics gathered over the last %d minutes, %d seconds:\n\n" , minutes, seconds); } + +static void +update_old_counters (struct statinfo *new,struct statinfo *old) +{ +int z, i; +for (z =0 ; old[z].tag; z++) +for (i =0 ; i <= old[z].nrvals; i++) + old[z].valptr[i] += new[z].valptr[i]; + +}
utils/nfsstat/nfsstat.man +5 -1
@@ -91,7 +91,7 @@ output .I file are treated as zeroes. .TP -.B \-Z, \-\-sleep +.B \-Z[interval], \-\-sleep=[interval] Instead of printing current statistics and immediately exiting, .B nfsstat takes a snapshot of the current statistics and pauses until it receives
@@ -100,6 +100,10 @@ takes a snapshot of the current statistics and pauses until it receives .BR Ctrl-C ), at which point it takes another snapshot and displays the difference between the two. +If \fIinterval\fR is specified, +.B nfsstat +will print the number of \fBNFS\fR calls made since the previous report. +Stats will be printed repeatedly every \fIinterval\fR seconds. .\" --------------------- EXAMPLES ------------------------------- .SH EXAMPLES .TP
Signature · 1 line
1.6.0.4.761.g47577
A message that is not in the archive (sent off-list or not yet received): 1237275989-16421-1-git-send-email-kevin.constantine-FfNkGbSheRGpB8w63BLUukEOCMrvLtNR@public.gmane.org
PATCH 2/2 nfsstat: Add --list flag
nfsstat.c: Adds the --list flag to print information in a list format instead of the standard multi-column format nfsstat.man: Updates the manpage to include the --list flag.
--- utils/nfsstat/nfsstat.c | 80 +++++++++++++++++++++++++++++++++++++++++++-- utils/nfsstat/nfsstat.man | 3 ++ 2 files changed, 80 insertions(+), 3 deletions(-)
utils/nfsstat/nfsstat.c +77 -3
@@ -170,10 +170,13 @@ 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_stats_list (int );static void print_numbers (const char *,unsigned int *,unsigned int );static void print_callstats (const char *,const char **,unsigned int *,unsigned int ); +static void print_callstats_list (const char *,const char **, +unsigned int *,unsigned int );static int parse_raw_statfile (const char *,struct statinfo *);static int parse_pretty_statfile (const char *,struct statinfo *);
@@ -232,6 +235,7 @@ void usage(char *name) If # is provided, stats will be output every\n\ # seconds.\n\ -S, --since file Shows difference between current stats and those in 'file'\n\ + -l, --list Prints stats in list format\n\ --version Show program version\n\ --help What you just did\n\ \n", name);
@@ -254,6 +258,7 @@ static struct option longopts[] = { "version", 0, 0, '\2' }, { "sleep", 2, 0, 'Z' }, { "since", 1, 0, 'S' }, + { "list", 0, 0, 'l' }, { NULL, 0, 0, 0 } };
@@ -266,6 +271,7 @@ main(int argc, char **argv) opt_prt =0 , opt_sleep =0 , sleep_time =0 , + opt_list =0 , opt_since =0 ;int c; char *progname,
@@ -287,7 +293,7 @@ main(int argc, char **argv)else progname = argv[0 ]; -while ((c =getopt_long (argc, argv,"234acmno:Z::S:vrsz\1\2" , longopts,NULL )) !=EOF ) { +while ((c =getopt_long (argc, argv,"234acmno:Z::S:vrslz\1\2" , longopts,NULL )) !=EOF ) {switch (c) {case 'a' :fprintf (stderr,"nfsstat: nfs acls are not yet supported.\n" );
@@ -345,6 +351,9 @@ main(int argc, char **argv)case 's' : opt_srv =1 ;break ; +case 'l' : + opt_list =1 ; +break ;case 'z' :fprintf (stderr,"nfsstat: zeroing of nfs statistics " "not yet supported\n" );
@@ -425,7 +434,11 @@ main(int argc, char **argv)get_stats (NFSCLTSTAT , clientinfo_tmp, &opt_clt, opt_srv,0 );diff_stats (clientinfo_tmp, clientinfo,0 ); } -print_all_stats (opt_srv, opt_clt, opt_prt); +if (opt_list) { +print_stats_list (opt_prt); + }else { +print_all_stats (opt_srv, opt_clt, opt_prt); + }printf ("\n\n" );fflush (stdout);
@@ -433,7 +446,11 @@ main(int argc, char **argv)sleep (sleep_time); } }else { -print_all_stats (opt_srv, opt_clt, opt_prt); +if (opt_list) { +print_stats_list (opt_prt); + }else { +print_all_stats (opt_srv, opt_clt, opt_prt); + } }return 0 ;
@@ -564,6 +581,44 @@ print_client_stats(int opt_clt, int opt_prt) } } +static void +print_stats_list (int opt_prt) +{ +if (opt_prt &PRNT_CALLS ) { +if ((opt_prt &PRNT_V2 ) || ((opt_prt &PRNT_AUTO ) &&has_stats (cltproc2info))) { +print_callstats_list ( +"nfs v2 server" , + nfsv2name, srvproc2info +1 ,sizeof (nfsv2name)/sizeof (char *)); +printf ("\n" ); +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))) { +print_callstats_list ( +"nfs v3 server" , + nfsv3name, srvproc3info +1 ,sizeof (nfsv3name)/sizeof (char *)); +printf ("\n" ); +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))) { +print_callstats_list ( +"nfs v4 server" , + nfssrvproc4name, srvproc4info +1 ,sizeof (nfssrvproc4name)/sizeof (char *)); +printf ("\n" ); +print_callstats_list ( +"nfs v4 ops" , + nfssrvproc4opname, srvproc4opsinfo +1 ,sizeof (nfssrvproc4opname)/sizeof (char *)); +printf ("\n" ); +print_callstats_list ( +"nfs v4 client" , + nfscltproc4name, cltproc4info +1 ,sizeof (nfscltproc4name)/sizeof (char *)); + } + } +} +static statinfo *get_stat_info (const char *sp,struct statinfo *statp) {
@@ -614,6 +669,25 @@ print_callstats(const char *hdr, const char **names,printf ("\n" ); } +static void +print_callstats_list (const char *hdr,const char **names, +unsigned int *callinfo,unsigned int nr) +{ +unsigned long long calltotal; +int i; + +for (i =0 , calltotal =0 ; i < nr; i++) { + calltotal += callinfo[i]; + } +printf ("%13s %13s %8llu \n" , hdr,"total:" , calltotal); +printf ("------------- ------------- --------\n" ); +for (i =0 ; i < nr; i++) { +printf ("%13s %12s: %8u \n" , hdr, names[i], callinfo[i]); + } + +} + +/* returns 0 on success, 1 otherwise */ static int parse_raw_statfile (const char *name,struct statinfo *statp)
utils/nfsstat/nfsstat.man +3 -0
@@ -72,6 +72,9 @@ Display all of the above facilities. .B \-v, \-\-verbose This is equivalent to \fB\-o all\fR. .TP +.B \-l, \-\-list +Print information in list form. +.TP .BI "\-S, \-\-since " file Instead of printing current statistics, .B nfsstat
Signature · 1 line
1.6.0.4.761.g47577
A message that is not in the archive (sent off-list or not yet received): 1237275989-16421-2-git-send-email-kevin.constantine-FfNkGbSheRGpB8w63BLUukEOCMrvLtNR@public.gmane.org
Greg Banks
Acked-byRe: [PATCH 2/2] nfsstat: Add --list flag
Quoted 9 lines · Kevin Constantine
nfsstat.c: Adds the --list flag to print information in a list format instead of the standard multi-column format nfsstat.man: Updates the manpage to include the --list flag.--- utils/nfsstat/nfsstat.c | 80 +++++++++++++++++++++++++++++++++++++++++++-- utils/nfsstat/nfsstat.man | 3 ++ 2 files changed, 80 insertions(+), 3 deletions(-)
Signature · 3 lines
Greg Banks, P.Engineer, SGI Australian Software Group. the brightly coloured sporks of revolution. I don't speak for SGI.
Greg Banks
Acked-byRe: [PATCH 1/2] nfsstat: Print diff stats every N seconds
In reply to a message not in the archiveQuoted 7 lines · Kevin Constantine
nfsstat.c: Implements an optional "interval" argument to --sleep nfsstat.man: Explains the use of --sleep[interval]---
Signature · 3 lines
Greg Banks, P.Engineer, SGI Australian Software Group. the brightly coloured sporks of revolution. I don't speak for SGI.
Re: [PATCH 2/2] nfsstat: Add --list flag
In reply to Greg BanksThanks Greg for taking a look...
Quoted 48 lines · Greg Banks
Kevin Constantine wrote:
Maybe you can smooth out this difference, and make the code simpler and cleaner, by making the output always be exactly two columns, one for the label and one for the value. Then your earlier quoted example would be something like
nfs v3 client total: 213
nfs v3 client null: 0
nfs v3 client getattr: 23
nfs v3 client setattr: 9
nfs v3 client lookup: 8
nfs v3 client access: 1
nfs v3 client readlink: 0
nfs v3 client read: 7
nfs v3 client write: 23
nfs v3 client create: 8
nfs v3 client mkdir: 0
nfs v3 client symlink: 0
nfs v3 client mknod: 0
nfs v3 client remove: 7
nfs v3 client rmdir: 0
nfs v3 client rename: 1
nfs v3 client link: 0
nfs v3 client readdir: 0
nfs v3 client readdirplus: 0
nfs v3 client fsstat: 126
nfs v3 client fsinfo: 0
nfs v3 client pathconf: 0
nfs v3 client commit: 0
nfs v3 server total: 0
nfs v3 server null: 0
nfs v3 server getattr: 0
nfs v3 server setattr: 0
nfs v3 server lookup: 0
nfs v3 server access: 0
nfs v3 server readlink: 0
nfs v3 server read: 0
nfs v3 server write: 0
nfs v3 server create: 0
nfs v3 server mkdir: 0
nfs v3 server symlink: 0
nfs v3 server mknod: 0
nfs v3 server remove: 0
nfs v3 server rmdir: 0
nfs v3 server rename: 0
nfs v3 server link: 0
nfs v3 server readdir: 0
Quoted 5 lines
nfs v3 server readdirplus: 0
nfs v3 server fsstat: 0
nfs v3 server fsinfo: 0
nfs v3 server pathconf: 0
nfs v3 server commit: 0Question... Now why are we *not* using the information from /proc/self/mountstats and doing this per mount?
Also, can I assume (not looking at the patches yet) that this same type info will be available v2 and v4?
Finally, does it really make sense to show a stats with zero occurrences? Why not just show what has happen instead of including what has not happen?
steved.
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 2/2] nfsstat: Add --list flag
Quoted 9 lines · Steve Dickson
Thanks Greg for taking a look...
Quoted 6 lines · Greg Banks
Kevin Constantine wrote:
Maybe you can smooth out this difference, and make the code simpler and cleaner, by making the output always be exactly two columns, one for the label and one for the value. Then your earlier quoted example would be something like
...
Quoted 8 lines
Quoted 6 lines
nfs v3 server readdir: 0 nfs v3 server readdirplus: 0 nfs v3 server fsstat: 0 nfs v3 server fsinfo: 0 nfs v3 server pathconf: 0 nfs v3 server commit: 0Finally, does it really make sense to show a stats with zero occurrences? Why not just show what has happen instead of including what has not happen?
I've done some playing with nfsstat and one thing I added was a -q (--quick) option that suppressed zero entries. It does make it a lot easier to look at stats when you only have to look at the interesting data.
Frank
Re: [PATCH 2/2] nfsstat: Add --list flag
In reply to a message not in the archiveQuoted 12 lines · Steve Dickson
Thanks Greg for taking a look...
Quoted 9 lines · Greg Banks
Kevin Constantine wrote:
Maybe you can smooth out this difference, and make the code simpler and cleaner, by making the output always be exactly two columns, one for the label and one for the value. Then your earlier quoted example would be something like
nfs v3 client total: 213
nfs v3 client null: 0
[...]
Quoted 7 lines
Quoted 7 lines
nfs v3 client readdirplus: 0
nfs v3 client fsstat: 126
nfs v3 client fsinfo: 0
nfs v3 client pathconf: 0
nfs v3 client commit: 0
nfs v3 server total: 0
nfs v3 server null: 0
[...]
Quoted 4 lines
Quoted 1 line
nfs v3 server commit: 0
Question... Now why are we *not* using the information from
/proc/self/mountstatsand doing this per mount?
nfsstat is already parsing /proc/net/rpc/nfs[d]. Re-writing it to parse /proc/self/mountstats seems like it should be a separate undertaking.
Quoted 3 lines
Also, can I assume (not looking at the patches yet) that this same type info will be available v2 and v4?
Yes. v2 and v4 will look the same. Here's the new format.
nfs v3 server total: 0
------------- ------------- --------
nfs v3 server null: 0 nfs v3 server getattr: 0 nfs v3 server setattr: 0 nfs v3 server lookup: 0 nfs v3 server access: 0 nfs v3 server readlink: 0 nfs v3 server read: 0 nfs v3 server write: 0 nfs v3 server create: 0 nfs v3 server mkdir: 0 nfs v3 server symlink: 0 nfs v3 server mknod: 0 nfs v3 server remove: 0 nfs v3 server rmdir: 0 nfs v3 server rename: 0 nfs v3 server link: 0 nfs v3 server readdir: 0 nfs v3 server readdirplus: 0 nfs v3 server fsstat: 0 nfs v3 server fsinfo: 0 nfs v3 server pathconf: 0 nfs v3 server commit: 0
nfs v3 client total: 203
------------- ------------- --------
nfs v3 client null: 0 nfs v3 client getattr: 23 nfs v3 client setattr: 7 nfs v3 client lookup: 7 nfs v3 client access: 0 nfs v3 client readlink: 0 nfs v3 client read: 7 nfs v3 client write: 21 nfs v3 client create: 7 nfs v3 client mkdir: 0 nfs v3 client symlink: 0 nfs v3 client mknod: 0 nfs v3 client remove: 7 nfs v3 client rmdir: 0 nfs v3 client rename: 0 nfs v3 client link: 0 nfs v3 client readdir: 0 nfs v3 client readdirplus: 0 nfs v3 client fsstat: 124 nfs v3 client fsinfo: 0 nfs v3 client pathconf: 0 nfs v3 client commit: 0
Quoted 3 lines
Finally, does it really make sense to show a stats with zero occurrences? Why not just show what has happen instead of including what has not happen?
The reason I left the zeroed stats in the display is so that the output stats fairly constant with the values being the only information that changes. If lines are popping in and out, it makes it difficult to keep an eye on what you really care about.
Quoted 3 lines
steved.
Quoted 20 lines · Kevin Constantine
nfsstat.c: Implemented --sleep[interval] option. nfsstat.man: Added information about the --sleep option--- utils/nfsstat/nfsstat.c | 158 +++++++++++++++++++++++++++++++++++++-------- utils/nfsstat/nfsstat.man | 6 ++- 2 files changed, 137 insertions(+), 27 deletions(-)utils/nfsstat/nfsstat.c +0
-0@@ -167,10 +167,16 @@ DECLARE_SRV(srvinfo, _old);@@ -183,6 +189,7 @@ static void get_stats(const char *, struct statinfo *, int *, int,@@ -207,26 +214,29 @@ void usage(char *name)@@ -245,7 +255,7 @@ static struct option longopts[] =@@ -258,6 +268,7 @@ main(int argc, char **argv)@@ -279,7 +290,7 @@ main(int argc, char **argv)@@ -311,6 +322,9 @@ main(int argc, char **argv)
utils/nfsstat/nfsstat.c main(int argc, char **argv) · line 398
Quoted 1 line
utils/nfsstat/nfsstat.c +0
-0@@ -384,7 +398,7 @@ main(int argc, char **argv)
All good.
Quoted 16 lines
utils/nfsstat/nfsstat.c +12
-0@@ -404,7 +418,33 @@ main(int argc, char **argv)diff_stats (clientinfo_tmp, clientinfo,0 ); } } +if (sleep_time) { +while (1 ) { +if (opt_srv) { +get_stats (NFSSRVSTAT , serverinfo_tmp , &opt_srv, opt_clt,1 ); +diff_stats (serverinfo_tmp, serverinfo,1 ); + } +if (opt_clt) { +get_stats (NFSCLTSTAT , clientinfo_tmp, &opt_clt, opt_srv,0 ); +diff_stats (clientinfo_tmp, clientinfo,0 ); + } +print_stats_list (opt_prt); +fflush (stdout);
utils/nfsstat/nfsstat.c main(int argc, char **argv) · line 442
Quoted 10 lines
utils/nfsstat/nfsstat.c +9
-0+ +update_old_counters (clientinfo_tmp, clientinfo); +sleep (sleep_time); + } + }else { +print_server_stats (opt_srv, opt_prt); +print_client_stats (opt_clt, opt_prt); + } +
So what I expected to see here, was both the sleep_time != 0 and sleep_time == 0 cases calling the same function which printed stats in the old format. Then the next patch could add the --list option which added a new feature to that function. In other words, print_stats_list() would be introduced in the 2nd patch.
utils/nfsstat/nfsstat.man output · line 92
Quoted 11 lines
utils/nfsstat/nfsstat.c +0
-0@@ -479,7 +519,10 @@ main(int argc, char **argv)@@ -515,10 +558,43 @@ main(int argc, char **argv)@@ -569,6 +645,26 @@ print_callstats(const char *hdr, const char **names,@@ -846,3 +942,13 @@ unpause(int sig)utils/nfsstat/nfsstat.man +0
-0@@ -91,7 +91,7 @@ output
The manpage change looks fine.
Signature · 3 lines
Greg Banks, P.Engineer, SGI Australian Software Group. the brightly coloured sporks of revolution. I don't speak for SGI.
Hey Kevin,
I apologize for taking so long to look at this... but...
Question: I notice that the v3 stats are displayed one way (in list format) and the v4 stats are display in another way (in column format) was this on purpose? Should they be displayed using the same format?
steved.
Quoted 289 lines · Kevin Constantine
nfsstat.c: Implemented --sleep[interval] option. nfsstat.man: Added information about the --sleep option--- utils/nfsstat/nfsstat.c | 158 +++++++++++++++++++++++++++++++++++++-------- utils/nfsstat/nfsstat.man | 6 ++- 2 files changed, 137 insertions(+), 27 deletions(-)utils/nfsstat/nfsstat.c +132
-26@@ -167,10 +167,16 @@ DECLARE_SRV(srvinfo, _old);DECLARE_CLT (cltinfo);DECLARE_CLT (cltinfo, _old); +static void print_server_stats (int ,int ); +static void print_client_stats (int ,int ); +static void print_stats_list (int );static void print_numbers (const char *,unsigned int *,unsigned int );static void print_callstats (const char *,const char **,unsigned int *,unsigned int ); +static void print_callstats_list (const char *,const char **, +unsigned int *,unsigned int *, +unsigned int );static int parse_raw_statfile (const char *,struct statinfo *);static int parse_pretty_statfile (const char *,struct statinfo *);@@ -183,6 +189,7 @@ static void get_stats(const char *, struct statinfo *, int *, int,static int has_stats (const unsigned int *);static void diff_stats (struct statinfo *,struct statinfo *,int );static void unpause (int ); +static void update_old_counters (struct statinfo *,struct statinfo *);static time_t starttime;@@ -207,26 +214,29 @@ void usage(char *name) {printf ("Usage: %s [OPTION]...\n\ \n\ --m, --mounts\t\tShow statistics on mounted NFS filesystems\n\ --c, --client\t\tShow NFS client statistics\n\ --s, --server\t\tShow NFS server statistics\n\ --2\t\t\tShow NFS version 2 statistics\n\ --3\t\t\tShow NFS version 3 statistics\n\ --4\t\t\tShow NFS version 4 statistics\n\ --o [facility]\t\tShow statistics on particular facilities.\n\ -nfs\tNFS protocol information\n\ -rpc\tGeneral RPC information\n\ -net\tNetwork layer statistics\n\ -fh\t\tUsage information on the server's file handle cache\n\ -rc\t\tUsage information on the server's request reply cache\n\ -all\tSelect all of the above\n\ --v, --verbose, --all\tSame as '-o all'\n\ --r, --rpc\t\tShow RPC statistics\n\ --n, --nfs\t\tShow NFS statistics\n\ --Z, --sleep\t\tSaves stats, pauses, diffs current and saved\n\ --S, --since file\tShows difference between current stats and those in 'file'\n\ ---version\t\tShow program version\n\ ---help\t\tWhat you just did\n\ +-m, --mounts Show statistics on mounted NFS filesystems\n\ +-c, --client Show NFS client statistics\n\ +-s, --server Show NFS server statistics\n\ +-2 Show NFS version 2 statistics\n\ +-3 Show NFS version 3 statistics\n\ +-4 Show NFS version 4 statistics\n\ +-o [facility] Show statistics on particular facilities.\n\ +nfs NFS protocol information\n\ +rpc General RPC information\n\ +net Network layer statistics\n\ +fh Usage information on the server's file handle cache\n\ +rc Usage information on the server's request reply cache\n\ +all Select all of the above\n\ +-v, --verbose, --all Same as '-o all'\n\ +-r, --rpc Show RPC statistics\n\ +-n, --nfs Show NFS statistics\n\ +-Z[#], --sleep[=#] Collects stats until interrupted.\n\ +Cumulative stats are then printed\n\ +If # is provided, stats will be output every\n\ +# seconds.\n\ +-S, --since file Shows difference between current stats and those in 'file'\n\ +--version Show program version\n\ +--help What you just did\n\ \n" , name);exit (0 ); }@@ -245,7 +255,7 @@ static struct option longopts[] = { "zero", 0, 0, 'z' }, { "help", 0, 0, '\1' }, { "version", 0, 0, '\2' }, - { "sleep", 0, 0, 'Z' }, + { "sleep", 2, 0, 'Z' }, { "since", 1, 0, 'S' }, { NULL, 0, 0, 0 } };@@ -258,6 +268,7 @@ main(int argc, char **argv) opt_clt =0 , opt_prt =0 , opt_sleep =0 , + sleep_time =0 , opt_since =0 ;int c; char *progname,@@ -279,7 +290,7 @@ main(int argc, char **argv)else progname = argv[0 ]; -while ((c =getopt_long (argc, argv,"234acmno:ZS:vrsz\1\2" , longopts,NULL )) !=EOF ) { +while ((c =getopt_long (argc, argv,"234acmno:Z::S:vrsz\1\2" , longopts,NULL )) !=EOF ) {switch (c) {case 'a' :fprintf (stderr,"nfsstat: nfs acls are not yet supported.\n" );@@ -311,6 +322,9 @@ main(int argc, char **argv)break ;case 'Z' : opt_sleep =1 ; +if (optarg) { + sleep_time =atoi (optarg); + }break ;case 'S' : opt_since =1 ;@@ -384,7 +398,7 @@ main(int argc, char **argv)if (opt_clt)get_stats (clientfile, clientinfo, &opt_clt, opt_srv,0 ); -if (opt_sleep) { +if (opt_sleep && !sleep_time) { starttime =time (NULL );printf ("Collecting statistics; press CTRL-C to view results from interval (i.e., from pause to CTRL-C).\n" );if (sigaction (SIGINT , &act,NULL ) !=0 ) {@@ -404,7 +418,33 @@ main(int argc, char **argv)diff_stats (clientinfo_tmp, clientinfo,0 ); } } +if (sleep_time) { +while (1 ) { +if (opt_srv) { +get_stats (NFSSRVSTAT , serverinfo_tmp , &opt_srv, opt_clt,1 ); +diff_stats (serverinfo_tmp, serverinfo,1 ); + } +if (opt_clt) { +get_stats (NFSCLTSTAT , clientinfo_tmp, &opt_clt, opt_srv,0 ); +diff_stats (clientinfo_tmp, clientinfo,0 ); + } +print_stats_list (opt_prt); +fflush (stdout); + +update_old_counters (clientinfo_tmp, clientinfo); +sleep (sleep_time); + } + }else { +print_server_stats (opt_srv, opt_prt); +print_client_stats (opt_clt, opt_prt); + } + +return 0 ; +} +static void +print_server_stats (int opt_srv,int opt_prt) +{if (opt_srv) {if (opt_prt &PRNT_NET ) { print_numbers(@@ -479,7 +519,10 @@ main(int argc, char **argv) } } } - +} +static void +print_client_stats (int opt_clt,int opt_prt) +{if (opt_clt) {if (opt_prt &PRNT_NET ) { print_numbers(@@ -515,10 +558,43 @@ main(int argc, char **argv) ); } } - -return 0 ; } +static void +print_stats_list (int opt_prt) +{ +if (opt_prt &PRNT_CALLS ) { +if ((opt_prt &PRNT_V2 ) || ((opt_prt &PRNT_AUTO ) &&has_stats (cltproc2info))) +print_callstats_list ( +"nfs v2 stats:" , + nfsv2name, srvproc2info +1 , cltproc2info +1 , +sizeof (nfsv2name)/sizeof (char *) + ); +printf ("\n" ); +if ((opt_prt &PRNT_V3 ) || ((opt_prt &PRNT_AUTO ) &&has_stats (cltproc3info))) +print_callstats_list ( +"nfs v3 stats:" , + nfsv3name, srvproc3info +1 , cltproc3info +1 , +sizeof (nfsv3name)/sizeof (char *) + ); +printf ("\n" ); +if ((opt_prt &PRNT_V4 ) || ((opt_prt &PRNT_AUTO ) &&has_stats (cltproc4info))) { +print_callstats ( + LABEL_srvproc4, + nfssrvproc4name, srvproc4info +1 ,sizeof (nfssrvproc4name)/sizeof (char *) + ); +print_callstats ( + LABEL_srvproc4ops, + nfssrvproc4opname, srvproc4opsinfo +1 ,sizeof (nfssrvproc4opname)/sizeof (char *) + ); +print_callstats ( + LABEL_cltproc4, + nfscltproc4name, cltproc4info +1 ,sizeof (nfscltproc4name)/sizeof (char *) + ); + } + } +} +static statinfo *get_stat_info (const char *sp,struct statinfo *statp) {@@ -569,6 +645,26 @@ print_callstats(const char *hdr, const char **names,printf ("\n" ); } +static void +print_callstats_list (const char *hdr,const char **names, +unsigned int *srvinfo,unsigned int *cltinfo, +unsigned int nr) +{ +unsigned long long srvtotal, clttotal; +int i; + +for (i =0 , srvtotal =0 , clttotal =0 ; i < nr; i++) { + srvtotal += srvinfo[i]; + clttotal += cltinfo[i]; + } +printf ("%13s %8s %8s\n" , hdr,"Server" ,"Client" ); +printf ("%12s: %8llu %8llu \n" ,"total" , srvtotal, clttotal); +for (i =0 ; i < nr; i++) { +printf ("%12s: %8u %8u \n" , names[i], srvinfo[i], cltinfo[i]); + } + +} +/* returns 0 on success, 1 otherwise */ static int parse_raw_statfile (const char *name,struct statinfo *statp)@@ -846,3 +942,13 @@ unpause(int sig) seconds = (int )time_diff %60 ;printf ("Signal received; displaying (only) statistics gathered over the last %d minutes, %d seconds:\n\n" , minutes, seconds); } + +static void +update_old_counters (struct statinfo *new,struct statinfo *old) +{ +int z, i; +for (z =0 ; old[z].tag; z++) +for (i =0 ; i <= old[z].nrvals; i++) + old[z].valptr[i] += new[z].valptr[i]; + +}utils/nfsstat/nfsstat.man +5
-1@@ -91,7 +91,7 @@ output .I file are treated as zeroes. .TP -.B \-Z, \-\-sleep +.B \-Z[interval], \-\-sleep=[interval] Instead of printing current statistics and immediately exiting, .B nfsstat takes a snapshot of the current statistics and pauses until it receives@@ -100,6 +100,10 @@ takes a snapshot of the current statistics and pauses until it receives .BR Ctrl-C ), at which point it takes another snapshot and displays the difference between the two. +If \fIinterval\fR is specified, +.B nfsstat +will print the number of \fBNFS\fR calls made since the previous report. +Stats will be printed repeatedly every \fIinterval\fR seconds. .\" --------------------- EXAMPLES ------------------------------- .SH EXAMPLES .TP
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 8 lines · Steve Dickson
Hey Kevin,
I apologize for taking so long to look at this... but...
Question: I notice that the v3 stats are displayed one
way (in list format) and the v4 stats are display in
another way (in column format) was this on purpose? Should they be displayed using the same format?
Steve-
I re-worked, and re-submitted the patches per some suggestions from Greg. I've since found an output bug that if --sleep=1 outputs a newline when there's no nfs traffic. It'd probably just be easiest if I re-send the patches at this point if that works for you.
-kevin
Quoted 16 lines
steved.
Quoted 13 lines · Kevin Constantine
nfsstat.c: Implemented --sleep[interval] option. nfsstat.man: Added information about the --sleep option--- utils/nfsstat/nfsstat.c | 158 +++++++++++++++++++++++++++++++++++++-------- utils/nfsstat/nfsstat.man | 6 ++- 2 files changed, 137 insertions(+), 27 deletions(-)utils/nfsstat/nfsstat.c +0
-0@@ -167,10 +167,16 @@ DECLARE_SRV(srvinfo, _old);
A message that is not in the archive (sent off-list or not yet received): 49D642F7.3040900-P5ys19MLBK/[email protected]
Quoted 10 lines · Kevin Constantine
Quoted 8 lines · Steve Dickson
Hey Kevin,
I apologize for taking so long to look at this... but...
Question: I notice that the v3 stats are displayed one way (in list format) and the v4 stats are display in another way (in column format) was this on purpose? Should they be displayed using the same format?
Quoted 5 lines
Steve-
I re-worked, and re-submitted the patches per some suggestions from Greg. I've since found an output bug that if --sleep=1 outputs a newline when there's no nfs traffic. It'd probably just be easiest if I re-send the patches at this point if that works for you.
Yeah I did notice that newline bug as well... It seem to echo newlines even when there was not data show... It was an easy enough to fix to I just when ahead and fixed it..
I'll wait for the repost.. will you be reposting the "nfsstat: Add --list flag" patch as well or is that read to go?
steved.