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

Use the new macros abstracting the page coloring/queues implementation.

Browse Source 
(There are no functional changes.)
This commit is contained in:
Alan Cox 2006-01-27 07:28:51 +00:00
parent a3d0ab47a6
commit 997e1c252b
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/vm/vm_map.c
View File

@ -1426,7 +1426,7 @@ vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot,
are_queues_locked = TRUE;
vm_page_lock_queues();
}
if ((p->queue - p->pc) == PQ_CACHE)
if (VM_PAGE_INQUEUE1(p, PQ_CACHE))
vm_page_deactivate(p);
mpte = pmap_enter_quick(map->pmap,
addr + ptoa(tmpidx), p, prot, mpte);

8
sys/vm/vm_object.c
View File

@ -719,7 +719,7 @@ vm_object_page_clean(vm_object_t object, vm_pindex_t start, vm_pindex_t end, int
curgeneration = object->generation;
p = vm_page_lookup(object, tscan);
if (p == NULL || p->valid == 0 ||
(p->queue - p->pc) == PQ_CACHE) {
VM_PAGE_INQUEUE1(p, PQ_CACHE)) {
if (--scanlimit == 0)
break;
++tscan;
@ -808,7 +808,7 @@ again:
if (((p->flags & PG_CLEANCHK) == 0) ||
(pi < tstart) || (pi >= tend) ||
(p->valid == 0) ||
((p->queue - p->pc) == PQ_CACHE)) {
VM_PAGE_INQUEUE1(p, PQ_CACHE)) {
vm_page_flag_clear(p, PG_CLEANCHK);
continue;
}
@ -886,7 +886,7 @@ vm_object_page_collect_flush(vm_object_t object, vm_page_t p, int curgeneration,
(tp->flags & PG_CLEANCHK) == 0) ||
(tp->busy != 0))
break;
if((tp->queue - tp->pc) == PQ_CACHE) {
if (VM_PAGE_INQUEUE1(tp, PQ_CACHE)) {
vm_page_flag_clear(tp, PG_CLEANCHK);
break;
}
@ -914,7 +914,7 @@ vm_object_page_collect_flush(vm_object_t object, vm_page_t p, int curgeneration,
(tp->flags & PG_CLEANCHK) == 0) ||
(tp->busy != 0))
break;
if ((tp->queue - tp->pc) == PQ_CACHE) {
if (VM_PAGE_INQUEUE1(tp, PQ_CACHE)) {
vm_page_flag_clear(tp, PG_CLEANCHK);
break;
}

4
sys/vm/vm_pageout.c
View File

@ -337,7 +337,7 @@ more:
ib = 0;
break;
}
if (((p->queue - p->pc) == PQ_CACHE) ||
if (VM_PAGE_INQUEUE1(p, PQ_CACHE) ||
(p->flags & (PG_BUSY|PG_UNMANAGED)) || p->busy) {
ib = 0;
break;
@ -367,7 +367,7 @@ more:
if ((p = vm_page_lookup(object, pindex + is)) == NULL)
break;
if (((p->queue - p->pc) == PQ_CACHE) ||
if (VM_PAGE_INQUEUE1(p, PQ_CACHE) ||
(p->flags & (PG_BUSY|PG_UNMANAGED)) || p->busy) {
break;
}

2
sys/vm/vm_pageq.c
View File

@ -277,7 +277,7 @@ vm_pageq_remove(vm_page_t m)
TAILQ_REMOVE(&pq->pl, m, pageq);
(*pq->cnt)--;
pq->lcnt--;
if ((queue - m->pc) == PQ_CACHE) {
if (VM_PAGE_RESOLVEQUEUE(m, queue) == PQ_CACHE) {
if (vm_paging_needed())
pagedaemon_wakeup();
}