d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename vm_pageq_requeue() to vm_page_requeue() on account of its recent

Browse Source 
migration to vm/vm_page.c.
This commit is contained in:
alc 2008-03-19 20:24:35 +00:00
parent e08a03d64d
commit caedbf233d
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/vm/vm_page.c
View File

@ -1216,7 +1216,7 @@ vm_waitpfault(void)
}
/*
* vm_pageq_requeue:
* vm_page_requeue:
*
* If the given page is contained within a page queue, move it to the tail
* of that queue.
@ -1224,7 +1224,7 @@ vm_waitpfault(void)
* The page queues must be locked.
*/
void
vm_pageq_requeue(vm_page_t m)
vm_page_requeue(vm_page_t m)
{
int queue = VM_PAGE_GETQUEUE(m);
struct vpgqueues *vpq;

2
sys/vm/vm_page.h
View File

@ -311,7 +311,6 @@ void vm_page_dirty(vm_page_t m);
void vm_page_wakeup(vm_page_t m);
void vm_pageq_remove(vm_page_t m);
void vm_pageq_requeue(vm_page_t m);
void vm_page_activate (vm_page_t);
vm_page_t vm_page_alloc (vm_object_t, vm_pindex_t, int);
@ -328,6 +327,7 @@ void vm_page_insert (vm_page_t, vm_object_t, vm_pindex_t);
vm_page_t vm_page_lookup (vm_object_t, vm_pindex_t);
void vm_page_remove (vm_page_t);
void vm_page_rename (vm_page_t, vm_object_t, vm_pindex_t);
void vm_page_requeue(vm_page_t m);
void vm_page_sleep(vm_page_t m, const char *msg);
vm_page_t vm_page_splay(vm_pindex_t, vm_page_t);
vm_offset_t vm_page_startup(vm_offset_t vaddr);

24
sys/vm/vm_pageout.c
View File

@ -567,14 +567,14 @@ vm_pageout_object_deactivate_pages(pmap, first_object, desired)
pmap_remove_all(p);
vm_page_deactivate(p);
} else {
vm_pageq_requeue(p);
vm_page_requeue(p);
}
} else {
vm_page_activate(p);
vm_page_flag_clear(p, PG_REFERENCED);
if (p->act_count < (ACT_MAX - ACT_ADVANCE))
p->act_count += ACT_ADVANCE;
vm_pageq_requeue(p);
vm_page_requeue(p);
}
} else if (p->queue == PQ_INACTIVE) {
pmap_remove_all(p);
@ -763,7 +763,7 @@ vm_pageout_scan(int pass)
* A held page may be undergoing I/O, so skip it.
*/
if (m->hold_count) {
vm_pageq_requeue(m);
vm_page_requeue(m);
addl_page_shortage++;
continue;
}
@ -878,7 +878,7 @@ vm_pageout_scan(int pass)
* the thrash point for a heavily loaded machine.
*/
vm_page_flag_set(m, PG_WINATCFLS);
vm_pageq_requeue(m);
vm_page_requeue(m);
} else if (maxlaunder > 0) {
/*
* We always want to try to flush some dirty pages if
@ -906,7 +906,7 @@ vm_pageout_scan(int pass)
*/
if (!swap_pageouts_ok || (object->flags & OBJ_DEAD)) {
VM_OBJECT_UNLOCK(object);
vm_pageq_requeue(m);
vm_page_requeue(m);
continue;
}
@ -999,7 +999,7 @@ vm_pageout_scan(int pass)
* be undergoing I/O, so skip it
*/
if (m->hold_count) {
vm_pageq_requeue(m);
vm_page_requeue(m);
if (object->flags & OBJ_MIGHTBEDIRTY)
vnodes_skipped++;
goto unlock_and_continue;
@ -1080,7 +1080,7 @@ vm_pageout_scan(int pass)
(m->oflags & VPO_BUSY) ||
(m->hold_count != 0)) {
VM_OBJECT_UNLOCK(object);
vm_pageq_requeue(m);
vm_page_requeue(m);
m = next;
continue;
}
@ -1117,7 +1117,7 @@ vm_pageout_scan(int pass)
* page activation count stats.
*/
if (actcount && (object->ref_count != 0)) {
vm_pageq_requeue(m);
vm_page_requeue(m);
} else {
m->act_count -= min(m->act_count, ACT_DECLINE);
if (vm_pageout_algorithm ||
@ -1134,7 +1134,7 @@ vm_pageout_scan(int pass)
vm_page_deactivate(m);
}
} else {
vm_pageq_requeue(m);
vm_page_requeue(m);
}
}
VM_OBJECT_UNLOCK(object);
@ -1315,7 +1315,7 @@ vm_pageout_page_stats()
(m->oflags & VPO_BUSY) ||
(m->hold_count != 0)) {
VM_OBJECT_UNLOCK(object);
vm_pageq_requeue(m);
vm_page_requeue(m);
m = next;
continue;
}
@ -1331,7 +1331,7 @@ vm_pageout_page_stats()
m->act_count += ACT_ADVANCE + actcount;
if (m->act_count > ACT_MAX)
m->act_count = ACT_MAX;
vm_pageq_requeue(m);
vm_page_requeue(m);
} else {
if (m->act_count == 0) {
/*
@ -1347,7 +1347,7 @@ vm_pageout_page_stats()
vm_page_deactivate(m);
} else {
m->act_count -= min(m->act_count, ACT_DECLINE);
vm_pageq_requeue(m);
vm_page_requeue(m);
}
}
VM_OBJECT_UNLOCK(object);