m_mfree no longer exists

SCCS-vsn: usr.bin/netstat/mbuf.c 4.6

diff --git a/usr/src/usr.bin/netstat/mbuf.c b/usr/src/usr.bin/netstat/mbuf.c
index c037804..7a22818 100644 (file)
--- a/usr/src/usr.bin/netstat/mbuf.c
+++ b/usr/src/usr.bin/netstat/mbuf.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)mbuf.c     4.5 82/12/18";
+static char sccsid[] = "@(#)mbuf.c     4.6 84/10/05";

 #endif
 
 #include <sys/param.h>
 #endif
 
 #include <sys/param.h>


@@ -18,13 +18,12 @@ static struct mbtypes {
        { MT_PCB,       "protocol control blocks" },
        { MT_RTABLE,    "routing table entries" },
        { MT_HTABLE,    "IMP host table entries" },
        { MT_PCB,       "protocol control blocks" },
        { MT_RTABLE,    "routing table entries" },
        { MT_HTABLE,    "IMP host table entries" },

-#ifdef notdef

        { MT_ATABLE,    "address resolution tables" },
        { MT_ATABLE,    "address resolution tables" },

-#endif

        { MT_FTABLE,    "fragment reassembly queue headers" },
        { MT_SONAME,    "socket names and addresses" },
        { MT_ZOMBIE,    "zombie process information" },
        { MT_SOOPTS,    "socket options" },
        { MT_FTABLE,    "fragment reassembly queue headers" },
        { MT_SONAME,    "socket names and addresses" },
        { MT_ZOMBIE,    "zombie process information" },
        { MT_SOOPTS,    "socket options" },

+       { MT_RIGHTS,    "access rights" },

        { 0, 0 }
 };
 
        { 0, 0 }
 };
 


@@ -47,7 +46,7 @@ mbpr(mbaddr)
                return;
        }
        printf("%d/%d mbufs in use:\n",
                return;
        }
        printf("%d/%d mbufs in use:\n",

-               mbstat.m_mbufs - mbstat.m_mbfree, mbstat.m_mbufs);
+               mbstat.m_mbufs - mbstat.m_mtypes[MT_FREE], mbstat.m_mbufs);

        totmbufs = 0;
        for (mp = mbtypes; mp->mt_name; mp++)
                if (mbstat.m_mtypes[mp->mt_type]) {
        totmbufs = 0;
        for (mp = mbtypes; mp->mt_name; mp++)
                if (mbstat.m_mtypes[mp->mt_type]) {


@@ -55,13 +54,13 @@ mbpr(mbaddr)
                                mbstat.m_mtypes[mp->mt_type], mp->mt_name);
                        totmbufs += mbstat.m_mtypes[mp->mt_type];
                }
                                mbstat.m_mtypes[mp->mt_type], mp->mt_name);
                        totmbufs += mbstat.m_mtypes[mp->mt_type];
                }

-       if (totmbufs != mbstat.m_mbufs - mbstat.m_mbfree)
+       if (totmbufs != mbstat.m_mbufs - mbstat.m_mtypes[MT_FREE])

                printf("*** %d mbufs missing ***\n",
                printf("*** %d mbufs missing ***\n",

-                       (mbstat.m_mbufs - mbstat.m_mbfree) - totmbufs);
+                       (mbstat.m_mbufs - mbstat.m_mtypes[MT_FREE]) - totmbufs);

        printf("%d/%d mapped pages in use\n",
                mbstat.m_clusters - mbstat.m_clfree, mbstat.m_clusters);
        printf("%d/%d mapped pages in use\n",
                mbstat.m_clusters - mbstat.m_clfree, mbstat.m_clusters);

-       totmem = mbstat.m_mbufs * MSIZE + mbstat.m_clusters * CLBYTES;
-       totfree = mbstat.m_mbfree * MSIZE + mbstat.m_clusters * CLBYTES;
+       totmem = totmbufs * MSIZE + mbstat.m_clusters * CLBYTES;
+       totfree = mbstat.m_mtypes[MT_FREE]*MSIZE + mbstat.m_clusters * CLBYTES;

        printf("%d Kbytes allocated to network (%d%% in use)\n",
                totmem / 1024, (totmem - totfree) * 100 / totmem);
        printf("%d requests for memory denied\n", mbstat.m_drops);
        printf("%d Kbytes allocated to network (%d%% in use)\n",
                totmem / 1024, (totmem - totfree) * 100 / totmem);
        printf("%d requests for memory denied\n", mbstat.m_drops);