blob: 1dfe804c9c4b296460f289692baf1cffb521be5e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
--- agent/mibgroup/host/hr_storage.c.orig Mon Mar 18 22:39:56 2002
+++ agent/mibgroup/host/hr_storage.c Sun Nov 17 00:43:32 2002
@@ -32,7 +32,7 @@
#else
#if HAVE_VM_VM_H
#include <vm/vm.h>
-#if HAVE_MACHINE_TYPES_H
+#if HAVE_MACHINE_TYPES_H && (!defined(__FreeBSD__) || __FreeBSD_version < 500000)
#include <machine/types.h>
#endif
#if HAVE_SYS_VMMETER_H
@@ -145,7 +145,7 @@
#define HRFS_mount mnt_mountp
#define HRFS_statfs statvfs
-#elif defined(HAVE_STATVFS)
+#elif defined(HAVE_STATVFS) && defined(HAVE_MNTENT)
extern struct mntent *HRFS_entry;
extern int fscount;
@@ -520,7 +520,7 @@
}
case HRSTORE_UNITS:
if ( store_idx < HRS_TYPE_FS_MAX )
-#if STRUCT_STATVFS_HAS_F_FRSIZE
+#if defined(STRUCT_STATVFS_HAS_F_FRSIZE) && defined(HAVE_MNTENT)
long_return = stat_buf.f_frsize;
#else
long_return = stat_buf.f_bsize;
@@ -601,7 +601,15 @@
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 !defined(__FreeBSD__) || __FreeBSD_version < 500021
long_return = mbstat.m_mbufs;
+#elif __FreeBSD_version < 500024
+ /* mbuf stats disabled */
+ return NULL;
+#else
+ /* XXX TODO: implement new method */
+ return NULL;
+#endif
#elif defined(NO_DUMMY_VALUES)
return NULL;
#else
@@ -660,7 +668,15 @@
+ (mclpool.pr_nget - mclpool.pr_nput)
* mclpool.pr_size;
#elif defined(MBSTAT_SYMBOL)
+#if !defined(__FreeBSD__) || __FreeBSD_version < 500021
long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */
+#elif __FreeBSD_version < 500024
+ /* mbuf stats disabled */
+ return NULL;
+#else
+ /* XXX TODO: implement new method */
+ return NULL;
+#endif
#elif defined(NO_DUMMY_VALUES)
return NULL;
#else
|
