diff options
| author | Bill Fenner <fenner@FreeBSD.org> | 2001-10-14 16:38:32 +0000 |
|---|---|---|
| committer | Bill Fenner <fenner@FreeBSD.org> | 2001-10-14 16:38:32 +0000 |
| commit | 7ce70975dd3b45c7780cc4da4e8ce6d3feceda9d (patch) | |
| tree | 489da772b8c2ae17e5e454cb30e7328ef70fd24c /net/net-snmp | |
| parent | a0eb5115dcb9e0c0391de057ae607bba075f0cac (diff) | |
| download | ports-7ce70975dd3b45c7780cc4da4e8ce6d3feceda9d.tar.gz ports-7ce70975dd3b45c7780cc4da4e8ce6d3feceda9d.zip | |
Handle mbuf statistics going away temporarily around
__FreeBSD_version 500021.
Leave a placeholder for reporting using the new method
added around __FreeBSD_version 500024.
(This fixes the build on -current.)
Notes
Notes:
svn path=/head/; revision=48758
Diffstat (limited to 'net/net-snmp')
| -rw-r--r-- | net/net-snmp/files/patch-hr_storage.c | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/net/net-snmp/files/patch-hr_storage.c b/net/net-snmp/files/patch-hr_storage.c new file mode 100644 index 000000000000..063c5bcc62ff --- /dev/null +++ b/net/net-snmp/files/patch-hr_storage.c @@ -0,0 +1,39 @@ +--- agent/mibgroup/host/hr_storage.c.orig Thu Mar 22 14:27:21 2001 ++++ agent/mibgroup/host/hr_storage.c Thu Oct 11 12:19:18 2001 +@@ -523,8 +523,18 @@ + for (i = 0; i < sizeof(mbstat.m_mtypes)/sizeof(mbstat.m_mtypes[0]); i++) + long_return += mbstat.m_mtypes[i]; + #elif defined(MBSTAT_SYMBOL) ++#if __FreeBSD_version < 500021 + long_return = mbstat.m_mbufs; + #else ++#if __FreeBSD_version < 500024 ++ /* mbuf stats disabled */ ++ return NULL; ++#else ++ /* XXX TODO: implement new method */ ++ return NULL; ++#endif ++#endif ++#else + return NULL; + #endif + break; +@@ -562,7 +572,17 @@ + long_return = (mbpool.pr_nget - mbpool.pr_nput)*mbpool.pr_size + + (mclpool.pr_nget - mclpool.pr_nput)*mclpool.pr_size; + #elif defined(MBSTAT_SYMBOL) ++#if __FreeBSD_version < 500021 + long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */ ++#else ++#if __FreeBSD_version < 500024 ++ /* mbuf stats disabled */ ++ return NULL; ++#else ++ /* XXX TODO: implement new method */ ++ return NULL; ++#endif ++#endif + #else + return NULL; + #endif |