76c76
< __FBSDID("$FreeBSD: stable/10/sys/vm/vm_pageout.c 283310 2015-05-23 09:14:29Z kib $");
---
> __FBSDID("$FreeBSD: stable/10/sys/vm/vm_pageout.c 284665 2015-06-21 06:28:26Z trasz $");
1796a1797
> msleep(&vm_daemon_needed, &vm_daemon_mtx, PPAUSE, "psleep",
1798c1799
< msleep(&vm_daemon_needed, &vm_daemon_mtx, PPAUSE, "psleep", hz);
---
> racct_enable ? hz : 0
1800c1801
< msleep(&vm_daemon_needed, &vm_daemon_mtx, PPAUSE, "psleep", 0);
---
> 0
1801a1803
> );
1876,1896c1878
< rsize = IDX_TO_OFF(size);
< PROC_LOCK(p);
< racct_set(p, RACCT_RSS, rsize);
< ravailable = racct_get_available(p, RACCT_RSS);
< PROC_UNLOCK(p);
< if (rsize > ravailable) {
< /*
< * Don't be overly aggressive; this might be
< * an innocent process, and the limit could've
< * been exceeded by some memory hog. Don't
< * try to deactivate more than 1/4th of process'
< * resident set size.
< */
< if (attempts <= 8) {
< if (ravailable < rsize - (rsize / 4))
< ravailable = rsize - (rsize / 4);
< }
< vm_pageout_map_deactivate_pages(
< &vm->vm_map, OFF_TO_IDX(ravailable));
< /* Update RSS usage after paging out. */
< size = vmspace_resident_count(vm);
---
> if (racct_enable) {
1899a1882
> ravailable = racct_get_available(p, RACCT_RSS);
1901,1902c1884,1911
< if (rsize > ravailable)
< tryagain = 1;
---
> if (rsize > ravailable) {
> /*
> * Don't be overly aggressive; this
> * might be an innocent process,
> * and the limit could've been exceeded
> * by some memory hog. Don't try
> * to deactivate more than 1/4th
> * of process' resident set size.
> */
> if (attempts <= 8) {
> if (ravailable < rsize -
> (rsize / 4)) {
> ravailable = rsize -
> (rsize / 4);
> }
> }
> vm_pageout_map_deactivate_pages(
> &vm->vm_map,
> OFF_TO_IDX(ravailable));
> /* Update RSS usage after paging out. */
> size = vmspace_resident_count(vm);
> rsize = IDX_TO_OFF(size);
> PROC_LOCK(p);
> racct_set(p, RACCT_RSS, rsize);
> PROC_UNLOCK(p);
> if (rsize > ravailable)
> tryagain = 1;
> }