svn commit: r287640 - in head: lib/libc/gen sys/sys sys/vm usr.bin/vmstat
Mark Johnston
markj at FreeBSD.org
Fri Sep 11 03:00:23 UTC 2015
Author: markj
Date: Fri Sep 11 03:00:20 2015
New Revision: 287640
URL: https://svnweb.freebsd.org/changeset/base/287640
Log:
Remove the v_cache_min and v_cache_max sysctls. They are unused and have
no effect.
Reviewed by: alc
Sponsored by: EMC / Isilon Storage Division
Modified:
head/lib/libc/gen/sysctl.3
head/sys/sys/vmmeter.h
head/sys/vm/vm_meter.c
head/sys/vm/vm_page.c
head/sys/vm/vm_param.h
head/usr.bin/vmstat/vmstat.c
Modified: head/lib/libc/gen/sysctl.3
==============================================================================
--- head/lib/libc/gen/sysctl.3 Fri Sep 11 02:53:22 2015 (r287639)
+++ head/lib/libc/gen/sysctl.3 Fri Sep 11 03:00:20 2015 (r287640)
@@ -28,7 +28,7 @@
.\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95
.\" $FreeBSD$
.\"
-.Dd May 17, 2013
+.Dd September 10, 2015
.Dt SYSCTL 3
.Os
.Sh NAME
@@ -736,8 +736,6 @@ privilege may change the value.
.It "VM_LOADAVG struct loadavg no"
.It "VM_TOTAL struct vmtotal no"
.It "VM_SWAPPING_ENABLED integer maybe"
-.It "VM_V_CACHE_MAX integer yes"
-.It "VM_V_CACHE_MIN integer yes"
.It "VM_V_FREE_MIN integer yes"
.It "VM_V_FREE_RESERVED integer yes"
.It "VM_V_FREE_TARGET integer yes"
@@ -757,12 +755,6 @@ The returned data consists of a
1 if process swapping is enabled or 0 if disabled.
This variable is
permanently set to 0 if the kernel was built with swapping disabled.
-.It Li VM_V_CACHE_MAX
-Maximum desired size of the cache queue.
-.It Li VM_V_CACHE_MIN
-Minimum desired size of the cache queue.
-If the cache queue size
-falls very far below this value, the pageout daemon is awakened.
.It Li VM_V_FREE_MIN
Minimum amount of memory (cache memory plus free memory)
required to be available before a process waiting on memory will be
Modified: head/sys/sys/vmmeter.h
==============================================================================
--- head/sys/sys/vmmeter.h Fri Sep 11 02:53:22 2015 (r287639)
+++ head/sys/sys/vmmeter.h Fri Sep 11 03:00:20 2015 (r287640)
@@ -97,8 +97,6 @@ struct vmmeter {
u_int v_inactive_target; /* (c) pages desired inactive */
u_int v_inactive_count; /* (q) pages inactive */
u_int v_cache_count; /* (f) pages on cache queue */
- u_int v_cache_min; /* (c) min pages desired on cache queue */
- u_int v_cache_max; /* (c) max pages in cached obj (unused) */
u_int v_pageout_free_min; /* (c) min pages reserved for kernel */
u_int v_interrupt_free_min; /* (c) reserved pages for int code */
u_int v_free_severe; /* (c) severe page depletion point */
@@ -113,6 +111,7 @@ struct vmmeter {
u_int v_vforkpages; /* (p) VM pages affected by vfork() */
u_int v_rforkpages; /* (p) VM pages affected by rfork() */
u_int v_kthreadpages; /* (p) VM pages affected by fork() by kernel */
+ u_int v_spare[2];
};
#ifdef _KERNEL
Modified: head/sys/vm/vm_meter.c
==============================================================================
--- head/sys/vm/vm_meter.c Fri Sep 11 02:53:22 2015 (r287639)
+++ head/sys/vm/vm_meter.c Fri Sep 11 03:00:20 2015 (r287640)
@@ -63,10 +63,6 @@ SYSCTL_UINT(_vm, VM_V_FREE_RESERVED, v_f
CTLFLAG_RW, &vm_cnt.v_free_reserved, 0, "Pages reserved for deadlock");
SYSCTL_UINT(_vm, VM_V_INACTIVE_TARGET, v_inactive_target,
CTLFLAG_RW, &vm_cnt.v_inactive_target, 0, "Pages desired inactive");
-SYSCTL_UINT(_vm, VM_V_CACHE_MIN, v_cache_min,
- CTLFLAG_RW, &vm_cnt.v_cache_min, 0, "Min pages on cache queue");
-SYSCTL_UINT(_vm, VM_V_CACHE_MAX, v_cache_max,
- CTLFLAG_RW, &vm_cnt.v_cache_max, 0, "Max pages on cache queue");
SYSCTL_UINT(_vm, VM_V_PAGEOUT_FREE_MIN, v_pageout_free_min,
CTLFLAG_RW, &vm_cnt.v_pageout_free_min, 0, "Min pages reserved for kernel");
SYSCTL_UINT(_vm, OID_AUTO, v_free_severe,
@@ -308,8 +304,6 @@ VM_STATS_VM(v_active_count, "Active page
VM_STATS_VM(v_inactive_target, "Desired inactive pages");
VM_STATS_VM(v_inactive_count, "Inactive pages");
VM_STATS_VM(v_cache_count, "Pages on cache queue");
-VM_STATS_VM(v_cache_min, "Min pages on cache queue");
-VM_STATS_VM(v_cache_max, "Max pages on cached queue");
VM_STATS_VM(v_pageout_free_min, "Min pages reserved for kernel");
VM_STATS_VM(v_interrupt_free_min, "Reserved pages for interrupt code");
VM_STATS_VM(v_forks, "Number of fork() calls");
Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c Fri Sep 11 02:53:22 2015 (r287639)
+++ head/sys/vm/vm_page.c Fri Sep 11 03:00:20 2015 (r287640)
@@ -3290,7 +3290,6 @@ DB_SHOW_COMMAND(page, vm_page_print_page
db_printf("vm_cnt.v_free_reserved: %d\n", vm_cnt.v_free_reserved);
db_printf("vm_cnt.v_free_min: %d\n", vm_cnt.v_free_min);
db_printf("vm_cnt.v_free_target: %d\n", vm_cnt.v_free_target);
- db_printf("vm_cnt.v_cache_min: %d\n", vm_cnt.v_cache_min);
db_printf("vm_cnt.v_inactive_target: %d\n", vm_cnt.v_inactive_target);
}
Modified: head/sys/vm/vm_param.h
==============================================================================
--- head/sys/vm/vm_param.h Fri Sep 11 02:53:22 2015 (r287639)
+++ head/sys/vm/vm_param.h Fri Sep 11 03:00:20 2015 (r287640)
@@ -79,8 +79,8 @@
#define VM_V_FREE_TARGET 4 /* vm_cnt.v_free_target */
#define VM_V_FREE_RESERVED 5 /* vm_cnt.v_free_reserved */
#define VM_V_INACTIVE_TARGET 6 /* vm_cnt.v_inactive_target */
-#define VM_V_CACHE_MIN 7 /* vm_cnt.v_cache_min */
-#define VM_V_CACHE_MAX 8 /* vm_cnt.v_cache_max */
+#define VM_OBSOLETE_7 7 /* unused, formerly v_cache_min */
+#define VM_OBSOLETE_8 8 /* unused, formerly v_cache_max */
#define VM_V_PAGEOUT_FREE_MIN 9 /* vm_cnt.v_pageout_free_min */
#define VM_OBSOLETE_10 10 /* pageout algorithm */
#define VM_SWAPPING_ENABLED 11 /* swapping enabled */
Modified: head/usr.bin/vmstat/vmstat.c
==============================================================================
--- head/usr.bin/vmstat/vmstat.c Fri Sep 11 02:53:22 2015 (r287639)
+++ head/usr.bin/vmstat/vmstat.c Fri Sep 11 03:00:20 2015 (r287640)
@@ -556,8 +556,6 @@ fill_vmmeter(struct vmmeter *vmmp)
GET_VM_STATS(vm, v_inactive_target);
GET_VM_STATS(vm, v_inactive_count);
GET_VM_STATS(vm, v_cache_count);
- GET_VM_STATS(vm, v_cache_min);
- GET_VM_STATS(vm, v_cache_max);
GET_VM_STATS(vm, v_pageout_free_min);
GET_VM_STATS(vm, v_interrupt_free_min);
/*GET_VM_STATS(vm, v_free_severe);*/
More information about the svn-src-head
mailing list