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
|
--- agent/mibgroup/hardware/memory/memory_freebsd.c.orig 2006-03-07 01:23:52.000000000 +0900
+++ agent/mibgroup/hardware/memory/memory_freebsd.c 2008-08-24 23:35:12.857234897 +0900
@@ -47,6 +47,9 @@
int phys_mem_mib[] = { CTL_HW, HW_PHYSMEM };
int user_mem_mib[] = { CTL_HW, HW_USERMEM };
+ long bufspace;
+
+
/*
* Retrieve the memory information from the underlying O/S...
*/
@@ -54,6 +57,7 @@
sysctl(phys_mem_mib, 2, &phys_mem, &mem_size, NULL, 0);
sysctl(user_mem_mib, 2, &user_mem, &mem_size, NULL, 0);
auto_nlist(SUM_SYMBOL, (char *) &vmem, sizeof(vmem));
+ auto_nlist(BUFSPACE_SYMBOL, (char *) &bufspace, sizeof(bufspace));
#ifndef freebsd4
pagesize = 1024;
#else
@@ -70,7 +74,7 @@
if (!mem->descr)
mem->descr = strdup("Physical memory");
mem->units = pagesize;
- mem->size = user_mem/pagesize;
+ mem->size = phys_mem/pagesize;
mem->free = total.t_free;
}
@@ -125,10 +129,22 @@
if (!mem->descr)
mem->descr = strdup("Cached memory");
mem->units = vmem.v_page_size;
- mem->size = vmem.v_cache_count;
+ mem->size = vmem.v_cache_count + vmem.v_inactive_count;
+ mem->free = -1;
+ }
+
+ mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_MBUF, 1 );
+ if (!mem) {
+ snmp_log_perror("No Memory Buffer info entry");
+ } else {
+ if (!mem->descr)
+ mem->descr = strdup("Memory Buffer");
+ mem->units = pagesize;
+ mem->size = bufspace/pagesize;
mem->free = -1;
}
+
nswap = swapmode(pagesize);
mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SWAP, 1 );
if (!mem) {
|
