diff options
| author | dyson <dyson@FreeBSD.org> | 1996-05-31 00:38:04 +0000 |
|---|---|---|
| committer | dyson <dyson@FreeBSD.org> | 1996-05-31 00:38:04 +0000 |
| commit | 65214cd0c8fbe9d65c224d853573549dba9406fa (patch) | |
| tree | d0c35b0aabebb0e4f78ad9db2efdb29f9ed4b272 /sys/vm/vm_page.c | |
| parent | a6023afadfbb05340c7296f1384561e1ecce012e (diff) | |
| download | FreeBSD-src-65214cd0c8fbe9d65c224d853573549dba9406fa.zip FreeBSD-src-65214cd0c8fbe9d65c224d853573549dba9406fa.tar.gz | |
This commit is dual-purpose, to fix more of the pageout daemon
queue corruption problems, and to apply Gary Palmer's code cleanups.
David Greenman helped with these problems also. There is still
a hang problem using X in small memory machines.
Diffstat (limited to 'sys/vm/vm_page.c')
| -rw-r--r-- | sys/vm/vm_page.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index af599af..dfd0a4a 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)vm_page.c 7.4 (Berkeley) 5/7/91 - * $Id: vm_page.c,v 1.51 1996/05/18 03:37:57 dyson Exp $ + * $Id: vm_page.c,v 1.52 1996/05/24 05:20:15 dyson Exp $ */ /* @@ -588,6 +588,10 @@ vm_page_alloc(object, pindex, page_req) m = TAILQ_FIRST(&vm_page_queue_cache); if (m == NULL) { splx(s); +#if defined(DIAGNOSTIC) + if (cnt.v_cache_count > 0) + printf("vm_page_alloc(NORMAL): missing pages on cache queue: %d\n", cnt.v_cache_count); +#endif pagedaemon_wakeup(); return (NULL); } @@ -606,6 +610,10 @@ vm_page_alloc(object, pindex, page_req) m = TAILQ_FIRST(&vm_page_queue_cache); if (m == NULL) { splx(s); +#if defined(DIAGNOSTIC) + if (cnt.v_cache_count > 0) + printf("vm_page_alloc(ZERO): missing pages on cache queue: %d\n", cnt.v_cache_count); +#endif pagedaemon_wakeup(); return (NULL); } @@ -625,6 +633,10 @@ vm_page_alloc(object, pindex, page_req) m = TAILQ_FIRST(&vm_page_queue_cache); if (m == NULL) { splx(s); +#if defined(DIAGNOSTIC) + if (cnt.v_cache_count > 0) + printf("vm_page_alloc(SYSTEM): missing pages on cache queue: %d\n", cnt.v_cache_count); +#endif pagedaemon_wakeup(); return (NULL); } @@ -661,7 +673,6 @@ vm_page_alloc(object, pindex, page_req) m->flags = PG_BUSY; } m->wire_count = 0; - m->act_count = 0; m->hold_count = 0; m->busy = 0; m->valid = 0; @@ -708,8 +719,6 @@ vm_page_activate(m) vm_page_unqueue(m); if (m->wire_count == 0) { - if (m->act_count < 5) - m->act_count = 5; TAILQ_INSERT_TAIL(&vm_page_queue_active, m, pageq); m->queue = PQ_ACTIVE; cnt.v_active_count++; @@ -847,8 +856,6 @@ vm_page_unwire(m) cnt.v_wire_count--; TAILQ_INSERT_TAIL(&vm_page_queue_active, m, pageq); m->queue = PQ_ACTIVE; - if (m->act_count < 5) - m->act_count = 5; cnt.v_active_count++; } splx(s); @@ -868,7 +875,7 @@ void vm_page_deactivate(m) register vm_page_t m; { - int spl; + int s; /* * Only move active pages -- ignore locked or already inactive ones. @@ -880,7 +887,7 @@ vm_page_deactivate(m) if (m->queue == PQ_INACTIVE) return; - spl = splvm(); + s = splvm(); if (m->wire_count == 0 && m->hold_count == 0) { if (m->queue == PQ_CACHE) cnt.v_reactivated++; @@ -889,7 +896,7 @@ vm_page_deactivate(m) m->queue = PQ_INACTIVE; cnt.v_inactive_count++; } - splx(spl); + splx(s); } /* |
