socsvn commit: r225204 - soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat

[oleksandr at FreeBSD.org]

Author: oleksandr
Date: Wed Aug 17 17:07:03 2011
New Revision: 225204
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=225204

Log:
  Modification of output

Modified:
  soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat/iostat.8
  soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat/iostat.c

Modified: soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat/iostat.8
==============================================================================
--- soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat/iostat.8	Wed Aug 17 17:04:04 2011	(r225203)
+++ soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat/iostat.8	Wed Aug 17 17:07:03 2011	(r225204)
@@ -120,21 +120,31 @@
 is also specified to enable the display of CPU or TTY statistics.
 .It Fl E
 Display device error statistics. 
-There are several different types of device errors.
+There are types of device errors.
 .Pp
 .Bl -tag -width indent -compact
 .It Type of errors:
-.Bl -tag -width 13n -compact
-.It retriable  
+.Bl -tag -width 18n -compact
+.It Retriable  
 Errors are not critical
-.It not_retriable 
+.It Not_retriable 
 Critical errors
-.It read
+.It Read
 Read errors
-.It write
+.It Write
 Write errors
-.It other
+.It Other
 Read/write errors
+.It Recoverable
+Recovered errors
+.It Device Not Ready
+Device is not ready
+.It Media
+Errors appeared in the disk device
+.It Hardware
+Errors associated with hardware
+.It Illegal Request
+The request to the device was illegal
 .El
 .El
 .It Fl h

Modified: soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat/iostat.c
==============================================================================
--- soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat/iostat.c	Wed Aug 17 17:04:04 2011	(r225203)
+++ soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat/iostat.c	Wed Aug 17 17:07:03 2011	(r225204)
@@ -763,7 +763,7 @@
 		printf("\n");
 	}
         if (Eflag>0) 
-		printf("                 Error Device Statistics\n");
+		printf("                    Error Device Statistics\n");
 	for (dn = 0; dn < num_devices; dn++) {
 		int di;
 
@@ -815,18 +815,18 @@
 			    cur.dinfo->devices[di].unit_number) == -1)
 				err(1, "aspRintf");
 		        printf("Device: %-8.8s Retriable: %d Non-retriable: %d "
-                               "Read: %d Write: %d Other: %d Recovered: %d "
-                               "Device Not Ready: %d Medium: %d Hardware: %d "
-                               "Illegal Request: %d",
+                               "Read: %d Write: %d Other: %d        " 
+                               "Recovered: %d Device Not Ready: %d Media: %d "
+                               "Hardware: %d Illegal Request: %d",
                                 devname,
        		                cur.dinfo->devices[di].dev_error.retriable,
 			        cur.dinfo->devices[di].dev_error.non_retriable,
     			        cur.dinfo->devices[di].dev_error.read_error,
   			        cur.dinfo->devices[di].dev_error.write_error,
    			        cur.dinfo->devices[di].dev_error.other_error,
-   			        cur.dinfo->devices[di].dev_error.recovered,
+   			        cur.dinfo->devices[di].dev_error.recoverable,
    			        cur.dinfo->devices[di].dev_error.not_ready,
-  			        cur.dinfo->devices[di].dev_error.medium_error,
+  			        cur.dinfo->devices[di].dev_error.media_error,
   			        cur.dinfo->devices[di].dev_error.hardware,
   			        cur.dinfo->devices[di].dev_error.illegal_req);
 			printf("\n");