subject:"svn commit\: r253587 \- head\/sys\/vm"

Re: svn commit: r253587 - head/sys/vm

2013-07-25 Thread Andrey Zonov

On 7/23/13 6:25 PM, Jeff Roberson wrote:
 Author: jeff
 Date: Wed Jul 24 01:25:56 2013
 New Revision: 253587
 URL: http://svnweb.freebsd.org/changeset/base/253587
 
 Log:
- Remove the long obsolete 'vm_pageout_algorithm' experiment.
   

There is more of it.

diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index d689b7c..7d7b90a 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -735,7 +735,6 @@ privilege may change the value.
 .It Sy Second level name  TypeChangeable
 .It VM_LOADAVGstruct loadavg  no
 .It VM_TOTAL  struct vmtotal  no
-.It VM_PAGEOUT_ALGORITHM  integer yes
 .It VM_SWAPPING_ENABLED   integer maybe
 .It VM_V_CACHE_MAXinteger yes
 .It VM_V_CACHE_MINinteger yes
@@ -754,9 +753,6 @@ The returned data consists of a
 Return the system wide virtual memory statistics.
 The returned data consists of a
 .Va struct vmtotal .
-.It Li VM_PAGEOUT_ALGORITHM
-0 if the statistics-based page management algorithm is in use
-or 1 if the near-LRU algorithm is in use.
 .It Li VM_SWAPPING_ENABLED
 1 if process swapping is enabled or 0 if disabled.
 This variable is
diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h
index c404989..44306be 100644
--- a/sys/vm/vm_param.h
+++ b/sys/vm/vm_param.h
@@ -82,9 +82,8 @@
 #defineVM_V_CACHE_MIN  7   /* cnt.v_cache_min */
 #defineVM_V_CACHE_MAX  8   /* cnt.v_cache_max */
 #define VM_V_PAGEOUT_FREE_MIN  9   /* cnt.v_pageout_free_min */
-#defineVM_PAGEOUT_ALGORITHM10  /* pageout algorithm */
-#define VM_SWAPPING_ENABLED11  /* swapping enabled */
-#defineVM_MAXID12  /* number of valid vm ids */
+#define VM_SWAPPING_ENABLED10  /* swapping enabled */
+#defineVM_MAXID11  /* number of valid vm ids */

 #define CTL_VM_NAMES { \
{ 0, 0 }, \
@@ -97,7 +96,6 @@
{ v_cache_min, CTLTYPE_UINT }, \
{ v_cache_max, CTLTYPE_UINT }, \
{ v_pageout_free_min, CTLTYPE_UINT}, \
-   { pageout_algorithm, CTLTYPE_INT}, \
{ swap_enabled, CTLTYPE_INT},\
 }

diff --git a/tools/tools/sysdoc/tunables.mdoc
b/tools/tools/sysdoc/tunables.mdoc
index 35ef9c0..8b426e6 100644
--- a/tools/tools/sysdoc/tunables.mdoc
+++ b/tools/tools/sysdoc/tunables.mdoc
@@ -2259,9 +2259,6 @@ Displays the number of swap devices available
 to the system.  This is a read-only variable.

 ---
-vm.pageout_algorithm
-

 vm.pageout_full_stats_interval

 ---


-- 
Andrey Zonov



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r253587 - head/sys/vm

2013-07-25 Thread Alan Cox


On Jul 25, 2013, at 3:40 PM, Andrey Zonov wrote:

 On 7/23/13 6:25 PM, Jeff Roberson wrote:
 Author: jeff
 Date: Wed Jul 24 01:25:56 2013
 New Revision: 253587
 URL: http://svnweb.freebsd.org/changeset/base/253587
 
 Log:
   - Remove the long obsolete 'vm_pageout_algorithm' experiment.
 
 
 There is more of it.
 

Thank you.  Please commit this.  

Alan

 diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
 index d689b7c..7d7b90a 100644
 --- a/lib/libc/gen/sysctl.3
 +++ b/lib/libc/gen/sysctl.3
 @@ -735,7 +735,6 @@ privilege may change the value.
 .It Sy Second level name  TypeChangeable
 .It VM_LOADAVGstruct loadavg  no
 .It VM_TOTAL  struct vmtotal  no
 -.It VM_PAGEOUT_ALGORITHM  integer yes
 .It VM_SWAPPING_ENABLED   integer maybe
 .It VM_V_CACHE_MAXinteger yes
 .It VM_V_CACHE_MINinteger yes
 @@ -754,9 +753,6 @@ The returned data consists of a
 Return the system wide virtual memory statistics.
 The returned data consists of a
 .Va struct vmtotal .
 -.It Li VM_PAGEOUT_ALGORITHM
 -0 if the statistics-based page management algorithm is in use
 -or 1 if the near-LRU algorithm is in use.
 .It Li VM_SWAPPING_ENABLED
 1 if process swapping is enabled or 0 if disabled.
 This variable is
 diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h
 index c404989..44306be 100644
 --- a/sys/vm/vm_param.h
 +++ b/sys/vm/vm_param.h
 @@ -82,9 +82,8 @@
 #defineVM_V_CACHE_MIN  7   /* cnt.v_cache_min */
 #defineVM_V_CACHE_MAX  8   /* cnt.v_cache_max */
 #define VM_V_PAGEOUT_FREE_MIN  9   /* cnt.v_pageout_free_min */
 -#defineVM_PAGEOUT_ALGORITHM10  /* pageout algorithm */
 -#define VM_SWAPPING_ENABLED11  /* swapping enabled */
 -#defineVM_MAXID12  /* number of valid vm ids */
 +#define VM_SWAPPING_ENABLED10  /* swapping enabled */
 +#defineVM_MAXID11  /* number of valid vm ids */
 
 #define CTL_VM_NAMES { \
{ 0, 0 }, \
 @@ -97,7 +96,6 @@
{ v_cache_min, CTLTYPE_UINT }, \
{ v_cache_max, CTLTYPE_UINT }, \
{ v_pageout_free_min, CTLTYPE_UINT}, \
 -   { pageout_algorithm, CTLTYPE_INT}, \
{ swap_enabled, CTLTYPE_INT},\
 }
 
 diff --git a/tools/tools/sysdoc/tunables.mdoc
 b/tools/tools/sysdoc/tunables.mdoc
 index 35ef9c0..8b426e6 100644
 --- a/tools/tools/sysdoc/tunables.mdoc
 +++ b/tools/tools/sysdoc/tunables.mdoc
 @@ -2259,9 +2259,6 @@ Displays the number of swap devices available
 to the system.  This is a read-only variable.
 
 ---
 -vm.pageout_algorithm
 -
 
 vm.pageout_full_stats_interval
 
 ---
 
 
 -- 
 Andrey Zonov
 

___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

svn commit: r253587 - head/sys/vm

2013-07-23 Thread Jeff Roberson

Author: jeff
Date: Wed Jul 24 01:25:56 2013
New Revision: 253587
URL: http://svnweb.freebsd.org/changeset/base/253587

Log:
   - Remove the long obsolete 'vm_pageout_algorithm' experiment.
  
  Discussed with:   alc
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/vm/vm_pageout.c

Modified: head/sys/vm/vm_pageout.c
==
--- head/sys/vm/vm_pageout.cWed Jul 24 01:08:45 2013(r253586)
+++ head/sys/vm/vm_pageout.cWed Jul 24 01:25:56 2013(r253587)
@@ -157,7 +157,6 @@ static int vm_pageout_stats;
 static int vm_pageout_stats_interval;
 static int vm_pageout_full_stats;
 static int vm_pageout_full_stats_interval;
-static int vm_pageout_algorithm;
 static int defer_swap_pageouts;
 static int disable_swap_pageouts;
 
@@ -169,9 +168,6 @@ static int vm_swap_enabled = 1;
 static int vm_swap_idle_enabled = 0;
 #endif
 
-SYSCTL_INT(_vm, VM_PAGEOUT_ALGORITHM, pageout_algorithm,
-   CTLFLAG_RW, vm_pageout_algorithm, 0, LRU page mgmt);
-
 SYSCTL_INT(_vm, OID_AUTO, max_launder,
CTLFLAG_RW, vm_max_launder, 0, Limit dirty flushes in pageout);
 
@@ -756,9 +752,7 @@ vm_pageout_object_deactivate_pages(pmap_
if (actcount == 0) {
p-act_count -= min(p-act_count,
ACT_DECLINE);
-   if (!remove_mode 
-   (vm_pageout_algorithm ||
-   p-act_count == 0)) {
+   if (!remove_mode  p-act_count == 0) {
pmap_remove_all(p);
vm_page_deactivate(p);
} else
@@ -1356,8 +1350,7 @@ relock_queues:
vm_page_requeue_locked(m);
else {
m-act_count -= min(m-act_count, ACT_DECLINE);
-   if (vm_pageout_algorithm ||
-   object-ref_count == 0 ||
+   if (object-ref_count == 0 ||
m-act_count == 0) {
page_shortage--;
/* Dequeue to avoid later lock recursion. */
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

Re: svn commit: r253587 - head/sys/vm

Re: svn commit: r253587 - head/sys/vm

svn commit: r253587 - head/sys/vm

3 matches

Site Navigation

Mail list logo

Footer information