Attachment #6864 for bug #15251

View | Details | Raw Unified | Return to bug 15251
Collapse All | Expand All




static LIST_HEAD(nchashhead, namecache) *nchashtbl;	/* Hash Table */
static TAILQ_HEAD(, namecache) ncneg;	/* Hash Table */
static u_long	nchash;			/* size of hash table */
SYSCTL_ULONG(_debug, OID_AUTO, nchash, CTLFLAG_RD, &nchash, "");
static u_long	ncnegfactor = 16;	/* ratio of negative entries */
SYSCTL_ULONG(_debug, OID_AUTO, ncnegfactor, CTLFLAG_RW, &ncnegfactor, "");
static u_long	numneg;		/* number of cache entries allocated */
SYSCTL_ULONG(_debug, OID_AUTO, numneg, CTLFLAG_RD, &numneg, "");
static u_long	numcache;		/* number of cache entries allocated */
SYSCTL_ULONG(_debug, OID_AUTO, numcache, CTLFLAG_RD, &numcache, "");
struct	nchstats nchstats;		/* cache effectiveness statistics */

static int	doingcache = 1;		/* 1 => enable the cache */

 */
SYSCTL_NODE(_vfs, OID_AUTO, cache, CTLFLAG_RW, 0, "Name cache statistics");
#define STATNODE(mode, name, var) \
	SYSCTL_ULONG(_vfs_cache, OID_AUTO, name, mode, var, "");
STATNODE(CTLFLAG_RD, numneg, &numneg);
STATNODE(CTLFLAG_RD, numcache, &numcache);
static u_long numcalls; STATNODE(CTLFLAG_RD, numcalls, &numcalls);




		wakeup(&proc0);
}

SYSCTL_UINT(_vm, VM_V_FREE_MIN, v_free_min,
	CTLFLAG_RW, &cnt.v_free_min, 0, "");
SYSCTL_UINT(_vm, VM_V_FREE_TARGET, v_free_target,
	CTLFLAG_RW, &cnt.v_free_target, 0, "");
SYSCTL_UINT(_vm, VM_V_FREE_RESERVED, v_free_reserved,
	CTLFLAG_RW, &cnt.v_free_reserved, 0, "");
SYSCTL_UINT(_vm, VM_V_INACTIVE_TARGET, v_inactive_target,
	CTLFLAG_RW, &cnt.v_inactive_target, 0, "");
SYSCTL_UINT(_vm, VM_V_CACHE_MIN, v_cache_min,
	CTLFLAG_RW, &cnt.v_cache_min, 0, "");
SYSCTL_UINT(_vm, VM_V_CACHE_MAX, v_cache_max,
	CTLFLAG_RW, &cnt.v_cache_max, 0, "");
SYSCTL_UINT(_vm, VM_V_PAGEOUT_FREE_MIN, v_pageout_free_min,
	CTLFLAG_RW, &cnt.v_pageout_free_min, 0, "");

SYSCTL_STRUCT(_vm, VM_LOADAVG, loadavg, CTLFLAG_RD, &averunnable, loadavg, "");

SYSCTL_NODE(_vm_stats, OID_AUTO, sys, CTLFLAG_RW, 0, "VM meter sys stats");
SYSCTL_NODE(_vm_stats, OID_AUTO, vm, CTLFLAG_RW, 0, "VM meter vm stats");
SYSCTL_NODE(_vm_stats, OID_AUTO, misc, CTLFLAG_RW, 0, "VM meter misc stats");
SYSCTL_UINT(_vm_stats_sys, OID_AUTO,
	v_swtch, CTLFLAG_RD, &cnt.v_swtch, 0, "Context switches");
SYSCTL_UINT(_vm_stats_sys, OID_AUTO,
	v_trap, CTLFLAG_RD, &cnt.v_trap, 0, "Traps");
SYSCTL_UINT(_vm_stats_sys, OID_AUTO,
	v_syscall, CTLFLAG_RD, &cnt.v_syscall, 0, "Syscalls");
SYSCTL_UINT(_vm_stats_sys, OID_AUTO,
	v_intr, CTLFLAG_RD, &cnt.v_intr, 0, "HW intr");
SYSCTL_UINT(_vm_stats_sys, OID_AUTO,
	v_soft, CTLFLAG_RD, &cnt.v_soft, 0, "SW intr");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_vm_faults, CTLFLAG_RD, &cnt.v_vm_faults, 0, "VM faults");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_cow_faults, CTLFLAG_RD, &cnt.v_cow_faults, 0, "COW faults");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_cow_optim, CTLFLAG_RD, &cnt.v_cow_optim, 0, "Optimized COW faults");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_zfod, CTLFLAG_RD, &cnt.v_zfod, 0, "Zero fill");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_ozfod, CTLFLAG_RD, &cnt.v_ozfod, 0, "Optimized zero fill");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_swapin, CTLFLAG_RD, &cnt.v_swapin, 0, "Swapin operations");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_swapout, CTLFLAG_RD, &cnt.v_swapout, 0, "Swapout operations");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_swappgsin, CTLFLAG_RD, &cnt.v_swappgsin, 0, "Swapin pages");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_swappgsout, CTLFLAG_RD, &cnt.v_swappgsout, 0, "Swapout pages");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_vnodein, CTLFLAG_RD, &cnt.v_vnodein, 0, "Vnodein operations");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_vnodeout, CTLFLAG_RD, &cnt.v_vnodeout, 0, "Vnodeout operations");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_vnodepgsin, CTLFLAG_RD, &cnt.v_vnodepgsin, 0, "Vnodein pages");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_vnodepgsout, CTLFLAG_RD, &cnt.v_vnodepgsout, 0, "Vnodeout pages");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_intrans, CTLFLAG_RD, &cnt.v_intrans, 0, "In transit page blocking");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_reactivated, CTLFLAG_RD, &cnt.v_reactivated, 0, "Reactivated pages");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_pdwakeups, CTLFLAG_RD, &cnt.v_pdwakeups, 0, "Pagedaemon wakeups");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_pdpages, CTLFLAG_RD, &cnt.v_pdpages, 0, "Pagedaemon page scans");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_dfree, CTLFLAG_RD, &cnt.v_dfree, 0, "");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_pfree, CTLFLAG_RD, &cnt.v_pfree, 0, "");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_tfree, CTLFLAG_RD, &cnt.v_tfree, 0, "");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_page_size, CTLFLAG_RD, &cnt.v_page_size, 0, "");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_page_count, CTLFLAG_RD, &cnt.v_page_count, 0, "");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_free_reserved, CTLFLAG_RD, &cnt.v_free_reserved, 0, "");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_free_target, CTLFLAG_RD, &cnt.v_free_target, 0, "");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_free_min, CTLFLAG_RD, &cnt.v_free_min, 0, "");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_free_count, CTLFLAG_RD, &cnt.v_free_count, 0, "");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_wire_count, CTLFLAG_RD, &cnt.v_wire_count, 0, "");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_active_count, CTLFLAG_RD, &cnt.v_active_count, 0, "");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_inactive_target, CTLFLAG_RD, &cnt.v_inactive_target, 0, "");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_inactive_count, CTLFLAG_RD, &cnt.v_inactive_count, 0, "");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_cache_count, CTLFLAG_RD, &cnt.v_cache_count, 0, "");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_cache_min, CTLFLAG_RD, &cnt.v_cache_min, 0, "");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_cache_max, CTLFLAG_RD, &cnt.v_cache_max, 0, "");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_pageout_free_min, CTLFLAG_RD, &cnt.v_pageout_free_min, 0, "");
SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
	v_interrupt_free_min, CTLFLAG_RD, &cnt.v_interrupt_free_min, 0, "");
SYSCTL_UINT(_vm_stats_misc, OID_AUTO,
	zero_page_count, CTLFLAG_RD, &vm_page_zero_count, 0, "");
#if 0
SYSCTL_INT(_vm_stats_misc, OID_AUTO,





static long *exec_copyout_strings __P((struct image_params *));

/* XXX This should be vm_size_t. */
static u_long ps_strings = PS_STRINGS;
SYSCTL_ULONG(_kern, KERN_PS_STRINGS, ps_strings, CTLFLAG_RD, &ps_strings, "");

/* XXX This should be vm_size_t. */
static u_long usrstack = USRSTACK;
SYSCTL_ULONG(_kern, KERN_USRSTACK, usrstack, CTLFLAG_RD, &usrstack, "");

/*
 * Each of the items is a pointer to a `const struct execsw', hence the

Lines 156-165 Link Here

(-)sys/sys/sysctl.h (+10 lines)
156	SYSCTL_OID(parent, nbr, name, CTLTYPE_INT\|access, \	156	SYSCTL_OID(parent, nbr, name, CTLTYPE_INT\|access, \
157	ptr, val, sysctl_handle_int, "I", descr)	157	ptr, val, sysctl_handle_int, "I", descr)
158		158
		159	/* Oid for an unsigned int. If ptr is NULL, val is returned. */
		160	#define SYSCTL_UINT(parent, nbr, name, access, ptr, val, descr) \
		161	SYSCTL_OID(parent, nbr, name, CTLTYPE_INT\|access, \
		162	ptr, val, sysctl_handle_int, "IU", descr)
		163
159	/* Oid for a long. The pointer must be non NULL. */	164	/* Oid for a long. The pointer must be non NULL. */
160	#define SYSCTL_LONG(parent, nbr, name, access, ptr, descr) \	165	#define SYSCTL_LONG(parent, nbr, name, access, ptr, descr) \
161	SYSCTL_OID(parent, nbr, name, CTLTYPE_INT\|access, \	166	SYSCTL_OID(parent, nbr, name, CTLTYPE_INT\|access, \
162	ptr, 0, sysctl_handle_long, "L", descr)	167	ptr, 0, sysctl_handle_long, "L", descr)
		168
		169	/* Oid for an unsigned long. The pointer must be non NULL. */
		170	#define SYSCTL_ULONG(parent, nbr, name, access, ptr, descr) \
		171	SYSCTL_OID(parent, nbr, name, CTLTYPE_INT\|access, \
		172	ptr, 0, sysctl_handle_long, "LU", descr)
163		173
164	/* Oid for an opaque object. Specified by a pointer and a length. */	174	/* Oid for an opaque object. Specified by a pointer and a length. */
165	#define SYSCTL_OPAQUE(parent, nbr, name, access, ptr, len, fmt, descr) \	175	#define SYSCTL_OPAQUE(parent, nbr, name, access, ptr, len, fmt, descr) \

Lines 270-276 Link Here

(-)sbin/sysctl/sysctl.c (-3 / +11 lines)
270	dev_t d = (dev_t )p;	270	dev_t d = (dev_t )p;
271	if (l2 != sizeof *d)	271	if (l2 != sizeof *d)
272	err(1, "T_dev_T %d != %d", l2, sizeof *d);	272	err(1, "T_dev_T %d != %d", l2, sizeof *d);
273	printf("{ major = %d, minor = %d }",	273	printf("{ major = %u, minor = %u }",
274	major(d), minor(d));	274	major(d), minor(d));
275	return (0);	275	return (0);
276	}	276	}
Lines 392-400 Link Here
392	case 'I':	392	case 'I':
393	if (!nflag)	393	if (!nflag)
394	printf("%s: ", name);	394	printf("%s: ", name);
		395	fmt++;
395	val = "";	396	val = "";
396	while (len >= sizeof(int)) {	397	while (len >= sizeof(int)) {
397	printf("%s%d", val, (int )p);	398	if(*fmt == 'U')
		399	printf("%s%u", val, (unsigned int )p);
		400	else
		401	printf("%s%d", val, (int )p);
398	val = " ";	402	val = " ";
399	len -= sizeof (int);	403	len -= sizeof (int);
400	p += sizeof (int);	404	p += sizeof (int);
Lines 404-410 Link Here
404	case 'L':	408	case 'L':
405	if (!nflag)	409	if (!nflag)
406	printf("%s: ", name);	410	printf("%s: ", name);
407	printf("%ld", (long )p);	411	fmt++;
		412	if(*fmt == 'U')
		413	printf("%lu", (unsigned long )p);
		414	else
		415	printf("%ld", (long )p);
408	return (0);	416	return (0);
409		417
410	case 'P':	418	case 'P':

Return to bug 15251

Lines 105-123 Link Here

(-)sys/vm/vm_meter.c (-48 / +48 lines)
105	wakeup(&proc0);	105	wakeup(&proc0);
106	}	106	}
107		107
108	SYSCTL_INT(_vm, VM_V_FREE_MIN, v_free_min,	108	SYSCTL_UINT(_vm, VM_V_FREE_MIN, v_free_min,
109	CTLFLAG_RW, &cnt.v_free_min, 0, "");	109	CTLFLAG_RW, &cnt.v_free_min, 0, "");
110	SYSCTL_INT(_vm, VM_V_FREE_TARGET, v_free_target,	110	SYSCTL_UINT(_vm, VM_V_FREE_TARGET, v_free_target,
111	CTLFLAG_RW, &cnt.v_free_target, 0, "");	111	CTLFLAG_RW, &cnt.v_free_target, 0, "");
112	SYSCTL_INT(_vm, VM_V_FREE_RESERVED, v_free_reserved,	112	SYSCTL_UINT(_vm, VM_V_FREE_RESERVED, v_free_reserved,
113	CTLFLAG_RW, &cnt.v_free_reserved, 0, "");	113	CTLFLAG_RW, &cnt.v_free_reserved, 0, "");
114	SYSCTL_INT(_vm, VM_V_INACTIVE_TARGET, v_inactive_target,	114	SYSCTL_UINT(_vm, VM_V_INACTIVE_TARGET, v_inactive_target,
115	CTLFLAG_RW, &cnt.v_inactive_target, 0, "");	115	CTLFLAG_RW, &cnt.v_inactive_target, 0, "");
116	SYSCTL_INT(_vm, VM_V_CACHE_MIN, v_cache_min,	116	SYSCTL_UINT(_vm, VM_V_CACHE_MIN, v_cache_min,
117	CTLFLAG_RW, &cnt.v_cache_min, 0, "");	117	CTLFLAG_RW, &cnt.v_cache_min, 0, "");
118	SYSCTL_INT(_vm, VM_V_CACHE_MAX, v_cache_max,	118	SYSCTL_UINT(_vm, VM_V_CACHE_MAX, v_cache_max,
119	CTLFLAG_RW, &cnt.v_cache_max, 0, "");	119	CTLFLAG_RW, &cnt.v_cache_max, 0, "");
120	SYSCTL_INT(_vm, VM_V_PAGEOUT_FREE_MIN, v_pageout_free_min,	120	SYSCTL_UINT(_vm, VM_V_PAGEOUT_FREE_MIN, v_pageout_free_min,
121	CTLFLAG_RW, &cnt.v_pageout_free_min, 0, "");	121	CTLFLAG_RW, &cnt.v_pageout_free_min, 0, "");
122		122
123	SYSCTL_STRUCT(_vm, VM_LOADAVG, loadavg, CTLFLAG_RD, &averunnable, loadavg, "");	123	SYSCTL_STRUCT(_vm, VM_LOADAVG, loadavg, CTLFLAG_RD, &averunnable, loadavg, "");
Lines 221-307 Link Here
221	SYSCTL_NODE(_vm_stats, OID_AUTO, sys, CTLFLAG_RW, 0, "VM meter sys stats");	221	SYSCTL_NODE(_vm_stats, OID_AUTO, sys, CTLFLAG_RW, 0, "VM meter sys stats");
222	SYSCTL_NODE(_vm_stats, OID_AUTO, vm, CTLFLAG_RW, 0, "VM meter vm stats");	222	SYSCTL_NODE(_vm_stats, OID_AUTO, vm, CTLFLAG_RW, 0, "VM meter vm stats");
223	SYSCTL_NODE(_vm_stats, OID_AUTO, misc, CTLFLAG_RW, 0, "VM meter misc stats");	223	SYSCTL_NODE(_vm_stats, OID_AUTO, misc, CTLFLAG_RW, 0, "VM meter misc stats");
224	SYSCTL_INT(_vm_stats_sys, OID_AUTO,	224	SYSCTL_UINT(_vm_stats_sys, OID_AUTO,
225	v_swtch, CTLFLAG_RD, &cnt.v_swtch, 0, "Context switches");	225	v_swtch, CTLFLAG_RD, &cnt.v_swtch, 0, "Context switches");
226	SYSCTL_INT(_vm_stats_sys, OID_AUTO,	226	SYSCTL_UINT(_vm_stats_sys, OID_AUTO,
227	v_trap, CTLFLAG_RD, &cnt.v_trap, 0, "Traps");	227	v_trap, CTLFLAG_RD, &cnt.v_trap, 0, "Traps");
228	SYSCTL_INT(_vm_stats_sys, OID_AUTO,	228	SYSCTL_UINT(_vm_stats_sys, OID_AUTO,
229	v_syscall, CTLFLAG_RD, &cnt.v_syscall, 0, "Syscalls");	229	v_syscall, CTLFLAG_RD, &cnt.v_syscall, 0, "Syscalls");
230	SYSCTL_INT(_vm_stats_sys, OID_AUTO,	230	SYSCTL_UINT(_vm_stats_sys, OID_AUTO,
231	v_intr, CTLFLAG_RD, &cnt.v_intr, 0, "HW intr");	231	v_intr, CTLFLAG_RD, &cnt.v_intr, 0, "HW intr");
232	SYSCTL_INT(_vm_stats_sys, OID_AUTO,	232	SYSCTL_UINT(_vm_stats_sys, OID_AUTO,
233	v_soft, CTLFLAG_RD, &cnt.v_soft, 0, "SW intr");	233	v_soft, CTLFLAG_RD, &cnt.v_soft, 0, "SW intr");
234	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	234	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
235	v_vm_faults, CTLFLAG_RD, &cnt.v_vm_faults, 0, "VM faults");	235	v_vm_faults, CTLFLAG_RD, &cnt.v_vm_faults, 0, "VM faults");
236	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	236	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
237	v_cow_faults, CTLFLAG_RD, &cnt.v_cow_faults, 0, "COW faults");	237	v_cow_faults, CTLFLAG_RD, &cnt.v_cow_faults, 0, "COW faults");
238	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	238	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
239	v_cow_optim, CTLFLAG_RD, &cnt.v_cow_optim, 0, "Optimized COW faults");	239	v_cow_optim, CTLFLAG_RD, &cnt.v_cow_optim, 0, "Optimized COW faults");
240	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	240	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
241	v_zfod, CTLFLAG_RD, &cnt.v_zfod, 0, "Zero fill");	241	v_zfod, CTLFLAG_RD, &cnt.v_zfod, 0, "Zero fill");
242	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	242	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
243	v_ozfod, CTLFLAG_RD, &cnt.v_ozfod, 0, "Optimized zero fill");	243	v_ozfod, CTLFLAG_RD, &cnt.v_ozfod, 0, "Optimized zero fill");
244	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	244	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
245	v_swapin, CTLFLAG_RD, &cnt.v_swapin, 0, "Swapin operations");	245	v_swapin, CTLFLAG_RD, &cnt.v_swapin, 0, "Swapin operations");
246	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	246	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
247	v_swapout, CTLFLAG_RD, &cnt.v_swapout, 0, "Swapout operations");	247	v_swapout, CTLFLAG_RD, &cnt.v_swapout, 0, "Swapout operations");
248	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	248	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
249	v_swappgsin, CTLFLAG_RD, &cnt.v_swappgsin, 0, "Swapin pages");	249	v_swappgsin, CTLFLAG_RD, &cnt.v_swappgsin, 0, "Swapin pages");
250	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	250	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
251	v_swappgsout, CTLFLAG_RD, &cnt.v_swappgsout, 0, "Swapout pages");	251	v_swappgsout, CTLFLAG_RD, &cnt.v_swappgsout, 0, "Swapout pages");
252	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	252	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
253	v_vnodein, CTLFLAG_RD, &cnt.v_vnodein, 0, "Vnodein operations");	253	v_vnodein, CTLFLAG_RD, &cnt.v_vnodein, 0, "Vnodein operations");
254	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	254	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
255	v_vnodeout, CTLFLAG_RD, &cnt.v_vnodeout, 0, "Vnodeout operations");	255	v_vnodeout, CTLFLAG_RD, &cnt.v_vnodeout, 0, "Vnodeout operations");
256	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	256	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
257	v_vnodepgsin, CTLFLAG_RD, &cnt.v_vnodepgsin, 0, "Vnodein pages");	257	v_vnodepgsin, CTLFLAG_RD, &cnt.v_vnodepgsin, 0, "Vnodein pages");
258	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	258	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
259	v_vnodepgsout, CTLFLAG_RD, &cnt.v_vnodepgsout, 0, "Vnodeout pages");	259	v_vnodepgsout, CTLFLAG_RD, &cnt.v_vnodepgsout, 0, "Vnodeout pages");
260	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	260	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
261	v_intrans, CTLFLAG_RD, &cnt.v_intrans, 0, "In transit page blocking");	261	v_intrans, CTLFLAG_RD, &cnt.v_intrans, 0, "In transit page blocking");
262	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	262	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
263	v_reactivated, CTLFLAG_RD, &cnt.v_reactivated, 0, "Reactivated pages");	263	v_reactivated, CTLFLAG_RD, &cnt.v_reactivated, 0, "Reactivated pages");
264	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	264	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
265	v_pdwakeups, CTLFLAG_RD, &cnt.v_pdwakeups, 0, "Pagedaemon wakeups");	265	v_pdwakeups, CTLFLAG_RD, &cnt.v_pdwakeups, 0, "Pagedaemon wakeups");
266	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	266	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
267	v_pdpages, CTLFLAG_RD, &cnt.v_pdpages, 0, "Pagedaemon page scans");	267	v_pdpages, CTLFLAG_RD, &cnt.v_pdpages, 0, "Pagedaemon page scans");
268	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	268	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
269	v_dfree, CTLFLAG_RD, &cnt.v_dfree, 0, "");	269	v_dfree, CTLFLAG_RD, &cnt.v_dfree, 0, "");
270	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	270	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
271	v_pfree, CTLFLAG_RD, &cnt.v_pfree, 0, "");	271	v_pfree, CTLFLAG_RD, &cnt.v_pfree, 0, "");
272	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	272	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
273	v_tfree, CTLFLAG_RD, &cnt.v_tfree, 0, "");	273	v_tfree, CTLFLAG_RD, &cnt.v_tfree, 0, "");
274	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	274	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
275	v_page_size, CTLFLAG_RD, &cnt.v_page_size, 0, "");	275	v_page_size, CTLFLAG_RD, &cnt.v_page_size, 0, "");
276	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	276	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
277	v_page_count, CTLFLAG_RD, &cnt.v_page_count, 0, "");	277	v_page_count, CTLFLAG_RD, &cnt.v_page_count, 0, "");
278	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	278	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
279	v_free_reserved, CTLFLAG_RD, &cnt.v_free_reserved, 0, "");	279	v_free_reserved, CTLFLAG_RD, &cnt.v_free_reserved, 0, "");
280	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	280	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
281	v_free_target, CTLFLAG_RD, &cnt.v_free_target, 0, "");	281	v_free_target, CTLFLAG_RD, &cnt.v_free_target, 0, "");
282	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	282	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
283	v_free_min, CTLFLAG_RD, &cnt.v_free_min, 0, "");	283	v_free_min, CTLFLAG_RD, &cnt.v_free_min, 0, "");
284	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	284	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
285	v_free_count, CTLFLAG_RD, &cnt.v_free_count, 0, "");	285	v_free_count, CTLFLAG_RD, &cnt.v_free_count, 0, "");
286	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	286	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
287	v_wire_count, CTLFLAG_RD, &cnt.v_wire_count, 0, "");	287	v_wire_count, CTLFLAG_RD, &cnt.v_wire_count, 0, "");
288	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	288	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
289	v_active_count, CTLFLAG_RD, &cnt.v_active_count, 0, "");	289	v_active_count, CTLFLAG_RD, &cnt.v_active_count, 0, "");
290	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	290	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
291	v_inactive_target, CTLFLAG_RD, &cnt.v_inactive_target, 0, "");	291	v_inactive_target, CTLFLAG_RD, &cnt.v_inactive_target, 0, "");
292	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	292	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
293	v_inactive_count, CTLFLAG_RD, &cnt.v_inactive_count, 0, "");	293	v_inactive_count, CTLFLAG_RD, &cnt.v_inactive_count, 0, "");
294	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	294	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
295	v_cache_count, CTLFLAG_RD, &cnt.v_cache_count, 0, "");	295	v_cache_count, CTLFLAG_RD, &cnt.v_cache_count, 0, "");
296	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	296	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
297	v_cache_min, CTLFLAG_RD, &cnt.v_cache_min, 0, "");	297	v_cache_min, CTLFLAG_RD, &cnt.v_cache_min, 0, "");
298	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	298	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
299	v_cache_max, CTLFLAG_RD, &cnt.v_cache_max, 0, "");	299	v_cache_max, CTLFLAG_RD, &cnt.v_cache_max, 0, "");
300	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	300	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
301	v_pageout_free_min, CTLFLAG_RD, &cnt.v_pageout_free_min, 0, "");	301	v_pageout_free_min, CTLFLAG_RD, &cnt.v_pageout_free_min, 0, "");
302	SYSCTL_INT(_vm_stats_vm, OID_AUTO,	302	SYSCTL_UINT(_vm_stats_vm, OID_AUTO,
303	v_interrupt_free_min, CTLFLAG_RD, &cnt.v_interrupt_free_min, 0, "");	303	v_interrupt_free_min, CTLFLAG_RD, &cnt.v_interrupt_free_min, 0, "");
304	SYSCTL_INT(_vm_stats_misc, OID_AUTO,	304	SYSCTL_UINT(_vm_stats_misc, OID_AUTO,
305	zero_page_count, CTLFLAG_RD, &vm_page_zero_count, 0, "");	305	zero_page_count, CTLFLAG_RD, &vm_page_zero_count, 0, "");
306	#if 0	306	#if 0
307	SYSCTL_INT(_vm_stats_misc, OID_AUTO,	307	SYSCTL_INT(_vm_stats_misc, OID_AUTO,

Lines 72-84 Link Here

(-)sys/kern/vfs_cache.c (-5 / +5 lines)
72	static LIST_HEAD(nchashhead, namecache) nchashtbl; / Hash Table */	72	static LIST_HEAD(nchashhead, namecache) nchashtbl; / Hash Table */
73	static TAILQ_HEAD(, namecache) ncneg; /* Hash Table */	73	static TAILQ_HEAD(, namecache) ncneg; /* Hash Table */
74	static u_long nchash; /* size of hash table */	74	static u_long nchash; /* size of hash table */
75	SYSCTL_INT(_debug, OID_AUTO, nchash, CTLFLAG_RD, &nchash, 0, "");	75	SYSCTL_ULONG(_debug, OID_AUTO, nchash, CTLFLAG_RD, &nchash, "");
76	static u_long ncnegfactor = 16; /* ratio of negative entries */	76	static u_long ncnegfactor = 16; /* ratio of negative entries */
77	SYSCTL_INT(_debug, OID_AUTO, ncnegfactor, CTLFLAG_RW, &ncnegfactor, 0, "");	77	SYSCTL_ULONG(_debug, OID_AUTO, ncnegfactor, CTLFLAG_RW, &ncnegfactor, "");
78	static u_long numneg; /* number of cache entries allocated */	78	static u_long numneg; /* number of cache entries allocated */
79	SYSCTL_INT(_debug, OID_AUTO, numneg, CTLFLAG_RD, &numneg, 0, "");	79	SYSCTL_ULONG(_debug, OID_AUTO, numneg, CTLFLAG_RD, &numneg, "");
80	static u_long numcache; /* number of cache entries allocated */	80	static u_long numcache; /* number of cache entries allocated */
81	SYSCTL_INT(_debug, OID_AUTO, numcache, CTLFLAG_RD, &numcache, 0, "");	81	SYSCTL_ULONG(_debug, OID_AUTO, numcache, CTLFLAG_RD, &numcache, "");
82	struct nchstats nchstats; /* cache effectiveness statistics */	82	struct nchstats nchstats; /* cache effectiveness statistics */
83		83
84	static int doingcache = 1; /* 1 => enable the cache */	84	static int doingcache = 1; /* 1 => enable the cache */
Lines 91-97 Link Here
91	*/	91	*/
92	SYSCTL_NODE(_vfs, OID_AUTO, cache, CTLFLAG_RW, 0, "Name cache statistics");	92	SYSCTL_NODE(_vfs, OID_AUTO, cache, CTLFLAG_RW, 0, "Name cache statistics");
93	#define STATNODE(mode, name, var) \	93	#define STATNODE(mode, name, var) \
94	SYSCTL_INT(_vfs_cache, OID_AUTO, name, mode, var, 0, "");	94	SYSCTL_ULONG(_vfs_cache, OID_AUTO, name, mode, var, "");
95	STATNODE(CTLFLAG_RD, numneg, &numneg);	95	STATNODE(CTLFLAG_RD, numneg, &numneg);
96	STATNODE(CTLFLAG_RD, numcache, &numcache);	96	STATNODE(CTLFLAG_RD, numcache, &numcache);
97	static u_long numcalls; STATNODE(CTLFLAG_RD, numcalls, &numcalls);	97	static u_long numcalls; STATNODE(CTLFLAG_RD, numcalls, &numcalls);

Lines 66-76 Link Here

(-)sys/kern/kern_exec.c (-4 / +6 lines)
66		66
67	static long exec_copyout_strings __P((struct image_params ));	67	static long exec_copyout_strings __P((struct image_params ));
68		68
69	static long ps_strings = PS_STRINGS;	69	/* XXX This should be vm_size_t. */
70	SYSCTL_LONG(_kern, KERN_PS_STRINGS, ps_strings, CTLFLAG_RD, &ps_strings, "");	70	static u_long ps_strings = PS_STRINGS;
		71	SYSCTL_ULONG(_kern, KERN_PS_STRINGS, ps_strings, CTLFLAG_RD, &ps_strings, "");
71		72
72	static long usrstack = USRSTACK;	73	/* XXX This should be vm_size_t. */
73	SYSCTL_LONG(_kern, KERN_USRSTACK, usrstack, CTLFLAG_RD, &usrstack, "");	74	static u_long usrstack = USRSTACK;
		75	SYSCTL_ULONG(_kern, KERN_USRSTACK, usrstack, CTLFLAG_RD, &usrstack, "");
74		76
75	/*	77	/*
76	* Each of the items is a pointer to a `const struct execsw', hence the	78	* Each of the items is a pointer to a `const struct execsw', hence the