Deleted Added
full compact
vm_meter.c (43748) vm_meter.c (46381)
1/*
2 * Copyright (c) 1982, 1986, 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)vm_meter.c 8.4 (Berkeley) 1/4/94
1/*
2 * Copyright (c) 1982, 1986, 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)vm_meter.c 8.4 (Berkeley) 1/4/94
34 * $Id: vm_meter.c,v 1.29 1999/01/21 09:41:52 dillon Exp $
34 * $Id: vm_meter.c,v 1.30 1999/02/07 21:48:22 dillon Exp $
35 */
36
37#include <sys/param.h>
38#include <sys/proc.h>
39#include <sys/systm.h>
40#include <sys/kernel.h>
41#include <sys/resource.h>
42#include <sys/vmmeter.h>

--- 72 unchanged lines hidden (view full) ---

115 CTLFLAG_RW, &cnt.v_inactive_target, 0, "");
116SYSCTL_INT(_vm, VM_V_CACHE_MIN, v_cache_min,
117 CTLFLAG_RW, &cnt.v_cache_min, 0, "");
118SYSCTL_INT(_vm, VM_V_CACHE_MAX, v_cache_max,
119 CTLFLAG_RW, &cnt.v_cache_max, 0, "");
120SYSCTL_INT(_vm, VM_V_PAGEOUT_FREE_MIN, v_pageout_free_min,
121 CTLFLAG_RW, &cnt.v_pageout_free_min, 0, "");
122
35 */
36
37#include <sys/param.h>
38#include <sys/proc.h>
39#include <sys/systm.h>
40#include <sys/kernel.h>
41#include <sys/resource.h>
42#include <sys/vmmeter.h>

--- 72 unchanged lines hidden (view full) ---

115 CTLFLAG_RW, &cnt.v_inactive_target, 0, "");
116SYSCTL_INT(_vm, VM_V_CACHE_MIN, v_cache_min,
117 CTLFLAG_RW, &cnt.v_cache_min, 0, "");
118SYSCTL_INT(_vm, VM_V_CACHE_MAX, v_cache_max,
119 CTLFLAG_RW, &cnt.v_cache_max, 0, "");
120SYSCTL_INT(_vm, VM_V_PAGEOUT_FREE_MIN, v_pageout_free_min,
121 CTLFLAG_RW, &cnt.v_pageout_free_min, 0, "");
122
123SYSCTL_STRUCT(_vm, VM_LOADAVG, loadavg, CTLFLAG_RD, &averunnable, loadavg, "");
123SYSCTL_STRUCT(_vm, VM_LOADAVG, loadavg, CTLFLAG_RD,
124 &averunnable, loadavg, "Machine loadaverage history");
124
125static int
126vmtotal SYSCTL_HANDLER_ARGS
127{
128 struct proc *p;
129 struct vmtotal total, *totalp;
130 vm_map_entry_t entry;
131 vm_object_t object;

--- 84 unchanged lines hidden (view full) ---

216 }
217 }
218 }
219 totalp->t_free = cnt.v_free_count + cnt.v_cache_count;
220 return (sysctl_handle_opaque(oidp, totalp, sizeof total, req));
221}
222
223SYSCTL_PROC(_vm, VM_METER, vmmeter, CTLTYPE_OPAQUE|CTLFLAG_RD,
125
126static int
127vmtotal SYSCTL_HANDLER_ARGS
128{
129 struct proc *p;
130 struct vmtotal total, *totalp;
131 vm_map_entry_t entry;
132 vm_object_t object;

--- 84 unchanged lines hidden (view full) ---

217 }
218 }
219 }
220 totalp->t_free = cnt.v_free_count + cnt.v_cache_count;
221 return (sysctl_handle_opaque(oidp, totalp, sizeof total, req));
222}
223
224SYSCTL_PROC(_vm, VM_METER, vmmeter, CTLTYPE_OPAQUE|CTLFLAG_RD,
224 0, sizeof(struct vmtotal), vmtotal, "S,vmtotal", "");
225 0, sizeof(struct vmtotal), vmtotal, "S,vmtotal",
226 "System virtual memory statistics");
225SYSCTL_NODE(_vm, OID_AUTO, stats, CTLFLAG_RW, 0, "VM meter stats");
226SYSCTL_NODE(_vm_stats, OID_AUTO, sys, CTLFLAG_RW, 0, "VM meter sys stats");
227SYSCTL_NODE(_vm_stats, OID_AUTO, vm, CTLFLAG_RW, 0, "VM meter vm stats");
228SYSCTL_NODE(_vm_stats, OID_AUTO, misc, CTLFLAG_RW, 0, "VM meter misc stats");
229SYSCTL_INT(_vm_stats_sys, OID_AUTO,
230 v_swtch, CTLFLAG_RD, &cnt.v_swtch, 0, "Context switches");
231SYSCTL_INT(_vm_stats_sys, OID_AUTO,
232 v_trap, CTLFLAG_RD, &cnt.v_trap, 0, "Traps");
233SYSCTL_INT(_vm_stats_sys, OID_AUTO,
234 v_syscall, CTLFLAG_RD, &cnt.v_syscall, 0, "Syscalls");
227SYSCTL_NODE(_vm, OID_AUTO, stats, CTLFLAG_RW, 0, "VM meter stats");
228SYSCTL_NODE(_vm_stats, OID_AUTO, sys, CTLFLAG_RW, 0, "VM meter sys stats");
229SYSCTL_NODE(_vm_stats, OID_AUTO, vm, CTLFLAG_RW, 0, "VM meter vm stats");
230SYSCTL_NODE(_vm_stats, OID_AUTO, misc, CTLFLAG_RW, 0, "VM meter misc stats");
231SYSCTL_INT(_vm_stats_sys, OID_AUTO,
232 v_swtch, CTLFLAG_RD, &cnt.v_swtch, 0, "Context switches");
233SYSCTL_INT(_vm_stats_sys, OID_AUTO,
234 v_trap, CTLFLAG_RD, &cnt.v_trap, 0, "Traps");
235SYSCTL_INT(_vm_stats_sys, OID_AUTO,
236 v_syscall, CTLFLAG_RD, &cnt.v_syscall, 0, "Syscalls");
235SYSCTL_INT(_vm_stats_sys, OID_AUTO,
236 v_intr, CTLFLAG_RD, &cnt.v_intr, 0, "HW intr");
237SYSCTL_INT(_vm_stats_sys, OID_AUTO,
238 v_soft, CTLFLAG_RD, &cnt.v_soft, 0, "SW intr");
237SYSCTL_INT(_vm_stats_sys, OID_AUTO, v_intr, CTLFLAG_RD,
238 &cnt.v_intr, 0, "Hardware interrupts");
239SYSCTL_INT(_vm_stats_sys, OID_AUTO, v_soft, CTLFLAG_RD,
240 &cnt.v_soft, 0, "Software interrupts");
239SYSCTL_INT(_vm_stats_vm, OID_AUTO,
240 v_vm_faults, CTLFLAG_RD, &cnt.v_vm_faults, 0, "VM faults");
241SYSCTL_INT(_vm_stats_vm, OID_AUTO,
242 v_cow_faults, CTLFLAG_RD, &cnt.v_cow_faults, 0, "COW faults");
243SYSCTL_INT(_vm_stats_vm, OID_AUTO,
244 v_cow_optim, CTLFLAG_RD, &cnt.v_cow_optim, 0, "Optimized COW faults");
245SYSCTL_INT(_vm_stats_vm, OID_AUTO,
246 v_zfod, CTLFLAG_RD, &cnt.v_zfod, 0, "Zero fill");

--- 78 unchanged lines hidden ---
241SYSCTL_INT(_vm_stats_vm, OID_AUTO,
242 v_vm_faults, CTLFLAG_RD, &cnt.v_vm_faults, 0, "VM faults");
243SYSCTL_INT(_vm_stats_vm, OID_AUTO,
244 v_cow_faults, CTLFLAG_RD, &cnt.v_cow_faults, 0, "COW faults");
245SYSCTL_INT(_vm_stats_vm, OID_AUTO,
246 v_cow_optim, CTLFLAG_RD, &cnt.v_cow_optim, 0, "Optimized COW faults");
247SYSCTL_INT(_vm_stats_vm, OID_AUTO,
248 v_zfod, CTLFLAG_RD, &cnt.v_zfod, 0, "Zero fill");

--- 78 unchanged lines hidden ---