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

Diff for /src/usr.bin/netstat/mbuf.c between version 1.35 and 1.36

version 1.35, 2015/01/20 18:26:57 version 1.36, 2015/09/04 08:21:01
Line 84 
Line 84 
         struct kinfo_pool pool;          struct kinfo_pool pool;
         struct mbtypes *mp;          struct mbtypes *mp;
         size_t size;          size_t size;
         int page_size = getpagesize();  
   
         if (nmbtypes != 256) {          if (nmbtypes != 256) {
                 fprintf(stderr,                  fprintf(stderr,
Line 167 
Line 166 
                             mbstat.m_mtypes[i],                              mbstat.m_mtypes[i],
                             plural(mbstat.m_mtypes[i]), i);                              plural(mbstat.m_mtypes[i]), i);
                 }                  }
         totmem = (mbpool.pr_npages * (unsigned long)page_size);          totmem = (mbpool.pr_npages * mbpool.pr_pgsize);
         totused = mbpool.pr_nout * mbpool.pr_size;          totused = mbpool.pr_nout * mbpool.pr_size;
         for (i = 0; i < mclp; i++) {          for (i = 0; i < mclp; i++) {
                 printf("%u/%lu/%lu mbuf %d byte clusters in use (current/peak/max)\n",                  printf("%u/%lu/%lu mbuf %d byte clusters in use"
                       " (current/peak/max)\n",
                     mclpools[i].pr_nout,                      mclpools[i].pr_nout,
                     (u_long)mclpools[i].pr_hiwat * mclpools[i].pr_itemsperpage,                      (unsigned long)
                     (u_long)mclpools[i].pr_maxpages * mclpools[i].pr_itemsperpage,                          (mclpools[i].pr_hiwat * mclpools[i].pr_itemsperpage),
                       (unsigned long)
                           (mclpools[i].pr_maxpages * mclpools[i].pr_itemsperpage),
                     mclpools[i].pr_size);                      mclpools[i].pr_size);
                 totmem += (mclpools[i].pr_npages * (unsigned long)page_size);                  totmem += (mclpools[i].pr_npages * mclpools[i].pr_pgsize);
                 totused += mclpools[i].pr_nout * mclpools[i].pr_size;                  totused += mclpools[i].pr_nout * mclpools[i].pr_size;
         }          }
   
         totpct = (totmem == 0)? 0 : (totused/(totmem / 100));          totpct = (totmem == 0) ? 0 : (totused/(totmem / 100));
         printf("%lu Kbytes allocated to network (%d%% in use)\n",          printf("%lu Kbytes allocated to network (%d%% in use)\n",
             totmem / 1024, totpct);              totmem / 1024, totpct);
         printf("%lu requests for memory denied\n", mbstat.m_drops);          printf("%lu requests for memory denied\n", mbstat.m_drops);

Legend:
Removed from v.1.35  
changed lines
  Added in v.1.36