[BACK]Return to if.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / systat

Diff for /src/usr.bin/systat/if.c between version 1.19 and 1.20

version 1.19, 2011/03/02 06:48:17 version 1.20, 2011/04/05 07:35:32
Line 44 
Line 44 
   
 static  int nifs = 0;  static  int nifs = 0;
 static int num_ifs = 0;  static int num_ifs = 0;
   static int show_bits = 0;
   
 void print_if(void);  void print_if(void);
 int read_if(void);  int read_if(void);
Line 288 
Line 289 
 static void  static void
 showifstat(struct ifstat *ifs)  showifstat(struct ifstat *ifs)
 {  {
           int conv = show_bits ? 8 : 1;
           int div = show_bits ? 1000 : 1024;
   
         print_fld_str(FLD_IF_IFACE, ifs->ifs_name);          print_fld_str(FLD_IF_IFACE, ifs->ifs_name);
   
         tb_start();          tb_start();
Line 309 
Line 313 
   
         print_fld_str(FLD_IF_DESC, ifs->ifs_description);          print_fld_str(FLD_IF_DESC, ifs->ifs_description);
   
         print_fld_size(FLD_IF_IBYTES, ifs->ifs_cur.ifc_ib);          print_fld_sdiv(FLD_IF_IBYTES, ifs->ifs_cur.ifc_ib * conv, div);
         print_fld_size(FLD_IF_IPKTS, ifs->ifs_cur.ifc_ip);          print_fld_size(FLD_IF_IPKTS, ifs->ifs_cur.ifc_ip);
         print_fld_size(FLD_IF_IERRS, ifs->ifs_cur.ifc_ie);          print_fld_size(FLD_IF_IERRS, ifs->ifs_cur.ifc_ie);
   
         print_fld_size(FLD_IF_OBYTES, ifs->ifs_cur.ifc_ob);          print_fld_sdiv(FLD_IF_OBYTES, ifs->ifs_cur.ifc_ob * conv, div);
         print_fld_size(FLD_IF_OPKTS, ifs->ifs_cur.ifc_op);          print_fld_size(FLD_IF_OPKTS, ifs->ifs_cur.ifc_op);
         print_fld_size(FLD_IF_OERRS, ifs->ifs_cur.ifc_oe);          print_fld_size(FLD_IF_OERRS, ifs->ifs_cur.ifc_oe);
   
Line 325 
Line 329 
 static void  static void
 showtotal(void)  showtotal(void)
 {  {
           int conv = show_bits ? 8 : 1;
           int div = show_bits ? 1000 : 1024;
   
         print_fld_str(FLD_IF_IFACE, "Totals");          print_fld_str(FLD_IF_IFACE, "Totals");
   
         print_fld_size(FLD_IF_IBYTES, sum.ifc_ib);          print_fld_sdiv(FLD_IF_IBYTES, sum.ifc_ib * conv, div);
         print_fld_size(FLD_IF_IPKTS, sum.ifc_ip);          print_fld_size(FLD_IF_IPKTS, sum.ifc_ip);
         print_fld_size(FLD_IF_IERRS, sum.ifc_ie);          print_fld_size(FLD_IF_IERRS, sum.ifc_ie);
   
         print_fld_size(FLD_IF_OBYTES, sum.ifc_ob);          print_fld_sdiv(FLD_IF_OBYTES, sum.ifc_ob * conv, div);
         print_fld_size(FLD_IF_OPKTS, sum.ifc_op);          print_fld_size(FLD_IF_OPKTS, sum.ifc_op);
         print_fld_size(FLD_IF_OERRS, sum.ifc_oe);          print_fld_size(FLD_IF_OERRS, sum.ifc_oe);
   
Line 358 
Line 365 
                 state = BOOT;                  state = BOOT;
                 for (ifs = ifstats; ifs < ifstats + nifs; ifs++)                  for (ifs = ifstats; ifs < ifstats + nifs; ifs++)
                         bzero(&ifs->ifs_old, sizeof(ifs->ifs_old));                          bzero(&ifs->ifs_old, sizeof(ifs->ifs_old));
                   gotsig_alarm = 1;
                   break;
           case 'B':
                   show_bits = !show_bits;
                   if (show_bits) {
                           FLD_IF_IBYTES->title = "IBITS";
                           FLD_IF_OBYTES->title = "OBITS";
                   } else {
                           FLD_IF_IBYTES->title = "IBYTES";
                           FLD_IF_OBYTES->title = "OBYTES";
                   }
                 gotsig_alarm = 1;                  gotsig_alarm = 1;
                 break;                  break;
         case 't':          case 't':
Legend:
Removed from v.1.19  
changed lines
  Added in v.1.20