[src/chs-ubc2]: src/sys/uvm update for uvm.aio_done being struct buf instead ...

[chs <chs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/87f91f7974b9
branches:  chs-ubc2
changeset: 471382:87f91f7974b9
user:      chs <chs%NetBSD.org@localhost>
date:      Sun Jul 04 02:04:29 1999 +0000

description:
update for uvm.aio_done being struct buf instead of struct uvm_aiodesc.
pull in a fix from -current.

diffstat:

 sys/uvm/uvm_pdaemon.c |  24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diffs (60 lines):

diff -r 6289a775eef9 -r 87f91f7974b9 sys/uvm/uvm_pdaemon.c
--- a/sys/uvm/uvm_pdaemon.c     Sun Jul 04 02:03:21 1999 +0000
+++ b/sys/uvm/uvm_pdaemon.c     Sun Jul 04 02:04:29 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_pdaemon.c,v 1.15.4.2 1999/06/21 01:47:22 thorpej Exp $     */
+/*     $NetBSD: uvm_pdaemon.c,v 1.15.4.3 1999/07/04 02:04:29 chs Exp $ */
 
 /* 
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -254,7 +254,11 @@
                 * if there's any free memory to be had,
                 * wake up any waiters.
                 */
-               wakeup(&uvmexp.free);
+
+               if (uvmexp.free > uvmexp.reserve_kernel ||
+                   uvmexp.paging == 0) {
+                       wakeup(&uvmexp.free);
+               }
 
                /*
                 * done scan.  unlock page queues (the only lock we are holding)
@@ -273,7 +277,7 @@
 uvm_aiodone_daemon()
 {
        int s;
-       struct uvm_aiodesc *aio, *nextaio;
+       struct buf *bp, *nbp;
        UVMHIST_FUNC("uvm_aiodoned"); UVMHIST_CALLED(pdhist);
 
        UVMHIST_LOG(pdhist,"<starting uvm aiodone daemon>", 0, 0, 0, 0);
@@ -307,8 +311,8 @@
                 * check for done aio structures
                 */
 
-               aio = TAILQ_FIRST(&uvm.aio_done);
-               if (aio) {
+               bp = TAILQ_FIRST(&uvm.aio_done);
+               if (bp) {
                        TAILQ_INIT(&uvm.aio_done);
                }
 
@@ -319,12 +323,12 @@
                 * process each i/o that's done.
                 */
 
-               for (/*null*/; aio != NULL ; aio = nextaio) {
-                       if (aio->flags & UVM_AIO_PAGEDAEMON) {
-                               uvmexp.paging -= aio->npages;
+               for (/*null*/; bp != NULL ; bp = nbp) {
+                       if (bp->b_flags & B_PDAEMON) {
+                               uvmexp.paging -= bp->b_bufsize >> PAGE_SHIFT;
                        }
-                       nextaio = TAILQ_NEXT(aio, aioq);
-                       aio->aiodone(aio);
+                       nbp = TAILQ_NEXT(bp, b_freelist);
+                       (*bp->b_iodone)(bp);
                }
        }
 }