No longer maintain mbstat statistics for the mbuf allocator, UMA

statistics and libmemstat(3) are now used to track mbuf statistics.

MFC after:	1 month
This commit is contained in:
Robert Watson 2005-09-27 20:28:43 +00:00
parent 92b4183c54
commit 32a6bd9510

View File

@ -227,7 +227,6 @@ mb_ctor_mbuf(void *mem, int size, void *arg, int how)
#endif #endif
} else } else
m->m_data = m->m_dat; m->m_data = m->m_dat;
mbstat.m_mbufs += 1; /* XXX */
return (0); return (0);
} }
@ -245,7 +244,6 @@ mb_dtor_mbuf(void *mem, int size, void *arg)
#ifdef INVARIANTS #ifdef INVARIANTS
trash_dtor(mem, size, arg); trash_dtor(mem, size, arg);
#endif #endif
mbstat.m_mbufs -= 1; /* XXX */
} }
/* XXX Only because of stats */ /* XXX Only because of stats */
@ -260,8 +258,6 @@ mb_dtor_pack(void *mem, int size, void *arg)
#ifdef INVARIANTS #ifdef INVARIANTS
trash_dtor(m->m_ext.ext_buf, MCLBYTES, arg); trash_dtor(m->m_ext.ext_buf, MCLBYTES, arg);
#endif #endif
mbstat.m_mbufs -= 1; /* XXX */
mbstat.m_mclusts -= 1; /* XXX */
} }
/* /*
@ -287,7 +283,6 @@ mb_ctor_clust(void *mem, int size, void *arg, int how)
m->m_ext.ext_size = MCLBYTES; m->m_ext.ext_size = MCLBYTES;
m->m_ext.ext_type = EXT_CLUSTER; m->m_ext.ext_type = EXT_CLUSTER;
m->m_ext.ref_cnt = NULL; /* Lazy counter assign. */ m->m_ext.ref_cnt = NULL; /* Lazy counter assign. */
mbstat.m_mclusts += 1; /* XXX */
return (0); return (0);
} }
@ -298,7 +293,6 @@ mb_dtor_clust(void *mem, int size, void *arg)
#ifdef INVARIANTS #ifdef INVARIANTS
trash_dtor(mem, size, arg); trash_dtor(mem, size, arg);
#endif #endif
mbstat.m_mclusts -= 1; /* XXX */
} }
/* /*
@ -318,7 +312,6 @@ mb_init_pack(void *mem, int size, int how)
#ifdef INVARIANTS #ifdef INVARIANTS
trash_init(m->m_ext.ext_buf, MCLBYTES, how); trash_init(m->m_ext.ext_buf, MCLBYTES, how);
#endif #endif
mbstat.m_mclusts -= 1; /* XXX */
return (0); return (0);
} }
@ -337,7 +330,6 @@ mb_fini_pack(void *mem, int size)
#endif #endif
uma_zfree_arg(zone_clust, m->m_ext.ext_buf, NULL); uma_zfree_arg(zone_clust, m->m_ext.ext_buf, NULL);
m->m_ext.ext_buf = NULL; m->m_ext.ext_buf = NULL;
mbstat.m_mclusts += 1; /* XXX */
#ifdef INVARIANTS #ifdef INVARIANTS
trash_dtor(mem, size, NULL); trash_dtor(mem, size, NULL);
#endif #endif
@ -387,8 +379,6 @@ mb_ctor_pack(void *mem, int size, void *arg, int how)
return (error); return (error);
#endif #endif
} }
mbstat.m_mbufs += 1; /* XXX */
mbstat.m_mclusts += 1; /* XXX */
return (0); return (0);
} }
@ -408,7 +398,6 @@ mb_reclaim(void *junk)
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK | WARN_PANIC, NULL, WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK | WARN_PANIC, NULL,
"mb_reclaim()"); "mb_reclaim()");
mbstat.m_drain++;
for (dp = domains; dp != NULL; dp = dp->dom_next) for (dp = domains; dp != NULL; dp = dp->dom_next)
for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
if (pr->pr_drain != NULL) if (pr->pr_drain != NULL)