X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/02c6746b0b7a05ed127aa5bb8a2799856b3ec1b4..7c69b0a93849e4342cef36fe09c036b501dec8b5:/usr/src/usr.bin/netstat/mbuf.c

diff --git a/usr/src/usr.bin/netstat/mbuf.c b/usr/src/usr.bin/netstat/mbuf.c
index c0378040cf..d1b84c87b7 100644
--- a/usr/src/usr.bin/netstat/mbuf.c
+++ b/usr/src/usr.bin/netstat/mbuf.c
@@ -1,9 +1,12 @@
 #ifndef lint
-static char sccsid[] = "@(#)mbuf.c	4.5 82/12/18";
+static char sccsid[] = "@(#)mbuf.c	4.8 85/04/07";
 #endif
 
+#include <stdio.h>
 #include <sys/param.h>
 #include <sys/mbuf.h>
+#define	YES	1
+typedef int bool;
 
 struct	mbstat mbstat;
 extern	int kmem;
@@ -18,16 +21,19 @@ static struct mbtypes {
 	{ MT_PCB,	"protocol control blocks" },
 	{ MT_RTABLE,	"routing table entries" },
 	{ MT_HTABLE,	"IMP host table entries" },
-#ifdef notdef
 	{ 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_RIGHTS,	"access rights" },
+	{ MT_IFADDR,	"interface addresses" }, 
 	{ 0, 0 }
 };
 
+int nmbtypes = sizeof(mbstat.m_mtypes) / sizeof(short);
+bool seen[256];			/* "have we seen this type yet?" */
+
 /*
  * Print mbuf statistics.
  */
@@ -35,8 +41,13 @@ mbpr(mbaddr)
 	off_t mbaddr;
 {
 	register int totmem, totfree, totmbufs;
+	register int i;
 	register struct mbtypes *mp;
 
+	if (nmbtypes != 256) {
+		fprintf(stderr, "unexpected change to mbstat; check source\n");
+		return;
+	}
 	if (mbaddr == 0) {
 		printf("mbstat: symbol not in namelist\n");
 		return;
@@ -47,21 +58,29 @@ mbpr(mbaddr)
 		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]) {
+			seen[mp->mt_type] = YES;
 			printf("\t%d mbufs allocated to %s\n",
-				mbstat.m_mtypes[mp->mt_type], mp->mt_name);
+			    mbstat.m_mtypes[mp->mt_type], mp->mt_name);
 			totmbufs += mbstat.m_mtypes[mp->mt_type];
 		}
-	if (totmbufs != mbstat.m_mbufs - mbstat.m_mbfree)
+	seen[MT_FREE] = YES;
+	for (i = 0; i < nmbtypes; i++)
+		if (!seen[i] && mbstat.m_mtypes[i]) {
+			printf("\t%d mbufs allocated to <mbuf type %d>\n",
+			    mbstat.m_mtypes[i], i);
+			totmbufs += mbstat.m_mtypes[i];
+		}
+	if (totmbufs != mbstat.m_mbufs - mbstat.m_mtypes[MT_FREE])
 		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);
 	totmem = mbstat.m_mbufs * MSIZE + mbstat.m_clusters * CLBYTES;
-	totfree = mbstat.m_mbfree * MSIZE + mbstat.m_clusters * CLBYTES;
+	totfree = mbstat.m_mtypes[MT_FREE]*MSIZE + mbstat.m_clfree * 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);