back out previous kprintf changes
This commit is contained in:
christos
parent
1ef19c7c74
commit
3dc7953eec
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: device_pager.c,v 1.22 1996/10/10 17:16:17 christos Exp $ */
|
||||
/* $NetBSD: device_pager.c,v 1.23 1996/10/12 21:50:05 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990 University of Utah.
|
||||
@ -93,7 +93,7 @@ dev_pager_init()
|
||||
{
|
||||
#ifdef DEBUG
|
||||
if (dpagerdebug & DDB_FOLLOW)
|
||||
kprintf("dev_pager_init()\n");
|
||||
printf("dev_pager_init()\n");
|
||||
#endif
|
||||
TAILQ_INIT(&dev_pager_list);
|
||||
TAILQ_INIT(&dev_pager_fakelist);
|
||||
@ -115,7 +115,7 @@ dev_pager_alloc(handle, size, prot, foff)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (dpagerdebug & DDB_FOLLOW)
|
||||
kprintf("dev_pager_alloc(%p, %lx, %x, %lx)\n",
|
||||
printf("dev_pager_alloc(%p, %lx, %x, %lx)\n",
|
||||
handle, size, prot, foff);
|
||||
#endif
|
||||
#ifdef DIAGNOSTIC
|
||||
@ -196,7 +196,7 @@ top:
|
||||
TAILQ_INSERT_TAIL(&dev_pager_list, pager, pg_list);
|
||||
#ifdef DEBUG
|
||||
if (dpagerdebug & DDB_ALLOC) {
|
||||
kprintf("dev_pager_alloc: pager %p devp %p object %p\n",
|
||||
printf("dev_pager_alloc: pager %p devp %p object %p\n",
|
||||
pager, devp, object);
|
||||
vm_object_print(object, FALSE);
|
||||
}
|
||||
@ -226,7 +226,7 @@ dev_pager_dealloc(pager)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (dpagerdebug & DDB_FOLLOW)
|
||||
kprintf("dev_pager_dealloc(%p)\n", pager);
|
||||
printf("dev_pager_dealloc(%p)\n", pager);
|
||||
#endif
|
||||
TAILQ_REMOVE(&dev_pager_list, pager, pg_list);
|
||||
/*
|
||||
@ -238,7 +238,7 @@ dev_pager_dealloc(pager)
|
||||
object = devp->devp_object;
|
||||
#ifdef DEBUG
|
||||
if (dpagerdebug & DDB_ALLOC)
|
||||
kprintf("dev_pager_dealloc: devp %p object %p\n", devp, object);
|
||||
printf("dev_pager_dealloc: devp %p object %p\n", devp, object);
|
||||
#endif
|
||||
/*
|
||||
* Free up our fake pages.
|
||||
@ -267,7 +267,7 @@ dev_pager_getpage(pager, mlist, npages, sync)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (dpagerdebug & DDB_FOLLOW)
|
||||
kprintf("dev_pager_getpage(%p, %p, %x, %x)\n",
|
||||
printf("dev_pager_getpage(%p, %p, %x, %x)\n",
|
||||
pager, mlist, npages, sync);
|
||||
#endif
|
||||
|
||||
@ -320,7 +320,7 @@ dev_pager_putpage(pager, mlist, npages, sync)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
if (dpagerdebug & DDB_FOLLOW)
|
||||
kprintf("dev_pager_putpage(%p, %p, %x, %x)\n",
|
||||
printf("dev_pager_putpage(%p, %p, %x, %x)\n",
|
||||
pager, mlist, npages, sync);
|
||||
#endif
|
||||
if (pager == NULL)
|
||||
@ -335,7 +335,7 @@ dev_pager_haspage(pager, offset)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
if (dpagerdebug & DDB_FOLLOW)
|
||||
kprintf("dev_pager_haspage(%p, %lx)\n", pager, offset);
|
||||
printf("dev_pager_haspage(%p, %lx)\n", pager, offset);
|
||||
#endif
|
||||
return(TRUE);
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: swap_pager.c,v 1.28 1996/10/10 17:16:19 christos Exp $ */
|
||||
/* $NetBSD: swap_pager.c,v 1.29 1996/10/12 21:50:07 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990 University of Utah.
|
||||
@ -165,7 +165,7 @@ swap_pager_init()
|
||||
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & (SDB_FOLLOW|SDB_INIT))
|
||||
kprintf("swpg_init()\n");
|
||||
printf("swpg_init()\n");
|
||||
#endif
|
||||
dfltpagerops = &swappagerops;
|
||||
TAILQ_INIT(&swap_pager_list);
|
||||
@ -217,7 +217,7 @@ swap_pager_init()
|
||||
swap_pager_maxcluster = dbtob(bsize);
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & SDB_INIT)
|
||||
kprintf("swpg_init: ix %d, size %lx, bsize %x\n",
|
||||
printf("swpg_init: ix %d, size %lx, bsize %x\n",
|
||||
i, swtab[i].st_osize, swtab[i].st_bsize);
|
||||
#endif
|
||||
if (bsize >= maxbsize)
|
||||
@ -247,7 +247,7 @@ swap_pager_alloc(handle, size, prot, foff)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & (SDB_FOLLOW|SDB_ALLOC))
|
||||
kprintf("swpg_alloc(%p, %lx, %x)\n", handle, size, prot);
|
||||
printf("swpg_alloc(%p, %lx, %x)\n", handle, size, prot);
|
||||
#endif
|
||||
/*
|
||||
* If this is a "named" anonymous region, look it up and
|
||||
@ -278,7 +278,7 @@ swap_pager_alloc(handle, size, prot, foff)
|
||||
if (swp == NULL) {
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & SDB_FAIL)
|
||||
kprintf("swpg_alloc: swpager malloc failed\n");
|
||||
printf("swpg_alloc: swpager malloc failed\n");
|
||||
#endif
|
||||
free((caddr_t)pager, M_VMPAGER);
|
||||
return(NULL);
|
||||
@ -302,7 +302,7 @@ swap_pager_alloc(handle, size, prot, foff)
|
||||
free((caddr_t)pager, M_VMPAGER);
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & SDB_FAIL)
|
||||
kprintf("swpg_alloc: sw_blocks malloc failed\n");
|
||||
printf("swpg_alloc: sw_blocks malloc failed\n");
|
||||
swt->st_inuse--;
|
||||
swt->st_usecnt--;
|
||||
#endif
|
||||
@ -337,7 +337,7 @@ swap_pager_alloc(handle, size, prot, foff)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & SDB_ALLOC)
|
||||
kprintf("swpg_alloc: pg_data %p, %x of %x at %p\n",
|
||||
printf("swpg_alloc: pg_data %p, %x of %x at %p\n",
|
||||
swp, swp->sw_nblocks, swp->sw_bsize, swp->sw_blocks);
|
||||
#endif
|
||||
return(pager);
|
||||
@ -357,7 +357,7 @@ swap_pager_dealloc(pager)
|
||||
if ((swpagerdebug & SDB_ANOMPANIC) && panicstr)
|
||||
return;
|
||||
if (swpagerdebug & (SDB_FOLLOW|SDB_ALLOC))
|
||||
kprintf("swpg_dealloc(%p)\n", pager);
|
||||
printf("swpg_dealloc(%p)\n", pager);
|
||||
#endif
|
||||
/*
|
||||
* Remove from list right away so lookups will fail if we
|
||||
@ -394,7 +394,7 @@ swap_pager_dealloc(pager)
|
||||
if (bp->swb_block) {
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & (SDB_ALLOCBLK|SDB_FULL))
|
||||
kprintf("swpg_dealloc: blk %x\n",
|
||||
printf("swpg_dealloc: blk %x\n",
|
||||
bp->swb_block);
|
||||
#endif
|
||||
rmfree(swapmap, swp->sw_bsize, bp->swb_block);
|
||||
@ -422,7 +422,7 @@ swap_pager_getpage(pager, mlist, npages, sync)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & SDB_FOLLOW)
|
||||
kprintf("swpg_getpage(%p, %p, %x, %x)\n",
|
||||
printf("swpg_getpage(%p, %p, %x, %x)\n",
|
||||
pager, mlist, npages, sync);
|
||||
#endif
|
||||
#ifdef DIAGNOSTIC
|
||||
@ -456,7 +456,7 @@ swap_pager_putpage(pager, mlist, npages, sync)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & SDB_FOLLOW)
|
||||
kprintf("swpg_putpage(%p, %p, %x, %x)\n",
|
||||
printf("swpg_putpage(%p, %p, %x, %x)\n",
|
||||
pager, mlist, npages, sync);
|
||||
#endif
|
||||
if (pager == NULL) {
|
||||
@ -481,14 +481,14 @@ swap_pager_haspage(pager, offset)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & (SDB_FOLLOW|SDB_ALLOCBLK))
|
||||
kprintf("swpg_haspage(%p, %lx) ", pager, offset);
|
||||
printf("swpg_haspage(%p, %lx) ", pager, offset);
|
||||
#endif
|
||||
swp = (sw_pager_t) pager->pg_data;
|
||||
ix = offset / dbtob(swp->sw_bsize);
|
||||
if (swp->sw_blocks == NULL || ix >= swp->sw_nblocks) {
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & (SDB_FAIL|SDB_FOLLOW|SDB_ALLOCBLK))
|
||||
kprintf("swpg_haspage: %p bad offset %lx, ix %x\n",
|
||||
printf("swpg_haspage: %p bad offset %lx, ix %x\n",
|
||||
swp->sw_blocks, offset, ix);
|
||||
#endif
|
||||
return(FALSE);
|
||||
@ -498,9 +498,9 @@ swap_pager_haspage(pager, offset)
|
||||
ix = atop(offset % dbtob(swp->sw_bsize));
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & SDB_ALLOCBLK)
|
||||
kprintf("%p blk %x+%x ", swp->sw_blocks, swb->swb_block, ix);
|
||||
printf("%p blk %x+%x ", swp->sw_blocks, swb->swb_block, ix);
|
||||
if (swpagerdebug & (SDB_FOLLOW|SDB_ALLOCBLK))
|
||||
kprintf("-> %c\n",
|
||||
printf("-> %c\n",
|
||||
"FT"[swb->swb_block && (swb->swb_mask & (1 << ix))]);
|
||||
#endif
|
||||
if (swb->swb_block && (swb->swb_mask & (1 << ix)))
|
||||
@ -521,7 +521,7 @@ swap_pager_cluster(pager, offset, loffset, hoffset)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & (SDB_FOLLOW|SDB_CLUSTER))
|
||||
kprintf("swpg_cluster(%p, %lx) ", pager, offset);
|
||||
printf("swpg_cluster(%p, %lx) ", pager, offset);
|
||||
#endif
|
||||
swp = (sw_pager_t) pager->pg_data;
|
||||
bsize = dbtob(swp->sw_bsize);
|
||||
@ -540,7 +540,7 @@ swap_pager_cluster(pager, offset, loffset, hoffset)
|
||||
*hoffset = hoff;
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & (SDB_FOLLOW|SDB_CLUSTER))
|
||||
kprintf("returns [%lx-%lx]\n", loff, hoff);
|
||||
printf("returns [%lx-%lx]\n", loff, hoff);
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -571,7 +571,7 @@ swap_pager_io(swp, mlist, npages, flags)
|
||||
if ((swpagerdebug & SDB_ANOMPANIC) && panicstr)
|
||||
return (VM_PAGER_FAIL); /* XXX: correct return? */
|
||||
if (swpagerdebug & (SDB_FOLLOW|SDB_IO))
|
||||
kprintf("swpg_io(%p, %p, %x, %x)\n", swp, mlist, npages, flags);
|
||||
printf("swpg_io(%p, %p, %x, %x)\n", swp, mlist, npages, flags);
|
||||
if (flags & B_READ) {
|
||||
if (flags & B_ASYNC)
|
||||
panic("swap_pager_io: cannot do ASYNC reads");
|
||||
@ -592,7 +592,7 @@ swap_pager_io(swp, mlist, npages, flags)
|
||||
if (swp->sw_blocks == NULL || ix >= swp->sw_nblocks) {
|
||||
#ifdef DEBUG
|
||||
if ((flags & B_READ) == 0 && (swpagerdebug & SDB_ANOM)) {
|
||||
kprintf("swap_pager_io: no swap block on write\n");
|
||||
printf("swap_pager_io: no swap block on write\n");
|
||||
return(VM_PAGER_BAD);
|
||||
}
|
||||
#endif
|
||||
@ -632,7 +632,7 @@ swap_pager_io(swp, mlist, npages, flags)
|
||||
if (swap_pager_free.tqh_first == NULL) {
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & SDB_FAIL)
|
||||
kprintf("%s: no available io headers\n",
|
||||
printf("%s: no available io headers\n",
|
||||
"swap_pager_io");
|
||||
#endif
|
||||
return(VM_PAGER_AGAIN);
|
||||
@ -647,7 +647,7 @@ swap_pager_io(swp, mlist, npages, flags)
|
||||
if (swb->swb_block == 0) {
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & SDB_FAIL)
|
||||
kprintf("swpg_io: rmalloc of %x failed\n",
|
||||
printf("swpg_io: rmalloc of %x failed\n",
|
||||
swp->sw_bsize);
|
||||
#endif
|
||||
/*
|
||||
@ -661,7 +661,7 @@ swap_pager_io(swp, mlist, npages, flags)
|
||||
}
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & (SDB_FULL|SDB_ALLOCBLK))
|
||||
kprintf("swpg_io: %p alloc blk %x at ix %x\n",
|
||||
printf("swpg_io: %p alloc blk %x at ix %x\n",
|
||||
swp->sw_blocks, swb->swb_block, ix);
|
||||
#endif
|
||||
}
|
||||
@ -674,7 +674,7 @@ swap_pager_io(swp, mlist, npages, flags)
|
||||
if (kva == NULL) {
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & SDB_FAIL)
|
||||
kprintf("%s: no KVA space to map pages\n",
|
||||
printf("%s: no KVA space to map pages\n",
|
||||
"swap_pager_io");
|
||||
#endif
|
||||
return(VM_PAGER_AGAIN);
|
||||
@ -687,7 +687,7 @@ swap_pager_io(swp, mlist, npages, flags)
|
||||
while (bswlist.b_actf == NULL) {
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & SDB_IO) /* XXX what should this be? */
|
||||
kprintf("swap_pager_io: wait on swbuf for %p (%d)\n",
|
||||
printf("swap_pager_io: wait on swbuf for %p (%d)\n",
|
||||
m, flags);
|
||||
#endif
|
||||
bswlist.b_flags |= B_WANTED;
|
||||
@ -721,15 +721,15 @@ swap_pager_io(swp, mlist, npages, flags)
|
||||
#ifdef DEBUG
|
||||
swap_pager_poip++;
|
||||
if (swpagerdebug & SDB_WRITE)
|
||||
kprintf("swpg_io: write: bp=%p swp=%p poip=%d\n",
|
||||
printf("swpg_io: write: bp=%p swp=%p poip=%d\n",
|
||||
bp, swp, swp->sw_poip);
|
||||
if ((swpagerdebug & SDB_ALLOCBLK) &&
|
||||
(swb->swb_mask & mask) != mask)
|
||||
kprintf("swpg_io: %p write %d pages at %x+%lx\n",
|
||||
printf("swpg_io: %p write %d pages at %x+%lx\n",
|
||||
swp->sw_blocks, npages, swb->swb_block,
|
||||
atop(off));
|
||||
if (swpagerdebug & SDB_CLUSTER)
|
||||
kprintf("swpg_io: off=%lx, npg=%x, mask=%x, bmask=%x\n",
|
||||
printf("swpg_io: off=%lx, npg=%x, mask=%x, bmask=%x\n",
|
||||
off, npages, mask, swb->swb_mask);
|
||||
#endif
|
||||
swb->swb_mask |= mask;
|
||||
@ -775,14 +775,14 @@ swap_pager_io(swp, mlist, npages, flags)
|
||||
*/
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & SDB_IO)
|
||||
kprintf("swpg_io: IO start: bp %p, db %lx, va %lx, pa %lx\n",
|
||||
printf("swpg_io: IO start: bp %p, db %lx, va %lx, pa %lx\n",
|
||||
bp, swb->swb_block+btodb(off), kva, VM_PAGE_TO_PHYS(m));
|
||||
#endif
|
||||
VOP_STRATEGY(bp);
|
||||
if ((flags & (B_READ|B_ASYNC)) == B_ASYNC) {
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & SDB_IO)
|
||||
kprintf("swpg_io: IO started: bp %p\n", bp);
|
||||
printf("swpg_io: IO started: bp %p\n", bp);
|
||||
#endif
|
||||
return(VM_PAGER_PEND);
|
||||
}
|
||||
@ -820,9 +820,9 @@ swap_pager_io(swp, mlist, npages, flags)
|
||||
splx(s);
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & SDB_IO)
|
||||
kprintf("swpg_io: IO done: bp %p, rv %d\n", bp, rv);
|
||||
printf("swpg_io: IO done: bp %p, rv %d\n", bp, rv);
|
||||
if ((swpagerdebug & SDB_FAIL) && rv == VM_PAGER_ERROR)
|
||||
kprintf("swpg_io: IO error\n");
|
||||
printf("swpg_io: IO error\n");
|
||||
#endif
|
||||
vm_pager_unmap_pages(kva, npages);
|
||||
return(rv);
|
||||
@ -842,7 +842,7 @@ swap_pager_clean(rw)
|
||||
if ((swpagerdebug & SDB_ANOMPANIC) && panicstr)
|
||||
return;
|
||||
if (swpagerdebug & SDB_FOLLOW)
|
||||
kprintf("swpg_clean(%x)\n", rw);
|
||||
printf("swpg_clean(%x)\n", rw);
|
||||
#endif
|
||||
|
||||
for (;;) {
|
||||
@ -900,7 +900,7 @@ swap_pager_clean(rw)
|
||||
* after awhile.
|
||||
*/
|
||||
if (spc->spc_flags & SPC_ERROR) {
|
||||
kprintf("%s: clean of page %lx failed\n",
|
||||
printf("%s: clean of page %lx failed\n",
|
||||
"swap_pager_clean", VM_PAGE_TO_PHYS(m));
|
||||
m->flags |= PG_LAUNDRY;
|
||||
} else {
|
||||
@ -927,7 +927,7 @@ swap_pager_clean(rw)
|
||||
TAILQ_INSERT_TAIL(&swap_pager_free, spc, spc_list);
|
||||
#ifdef DEBUG
|
||||
if (swpagerdebug & SDB_WRITE)
|
||||
kprintf("swpg_clean: free spc %p\n", spc);
|
||||
printf("swpg_clean: free spc %p\n", spc);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@ -957,7 +957,7 @@ swap_pager_clean_check(mlist, npages, rw)
|
||||
for (i = 0; i < npages; i++)
|
||||
if (m == mlist[i]) {
|
||||
if (swpagerdebug & SDB_ANOM)
|
||||
kprintf(
|
||||
printf(
|
||||
"swpg_clean_check: %s: page %p on list, flags %x\n",
|
||||
rw == B_WRITE ? "write" : "read", mlist[i], spc->spc_flags);
|
||||
bad = TRUE;
|
||||
@ -983,7 +983,7 @@ swap_pager_iodone(bp)
|
||||
if ((swpagerdebug & SDB_ANOMPANIC) && panicstr)
|
||||
return;
|
||||
if (swpagerdebug & SDB_FOLLOW)
|
||||
kprintf("swpg_iodone(%p)\n", bp);
|
||||
printf("swpg_iodone(%p)\n", bp);
|
||||
#endif
|
||||
s = splbio();
|
||||
for (spc = swap_pager_inuse.tqh_first;
|
||||
@ -1006,7 +1006,7 @@ swap_pager_iodone(bp)
|
||||
#ifdef DEBUG
|
||||
--swap_pager_poip;
|
||||
if (swpagerdebug & SDB_WRITE)
|
||||
kprintf("swpg_iodone: bp=%p swp=%p flags=%x spc=%p poip=%x\n",
|
||||
printf("swpg_iodone: bp=%p swp=%p flags=%x spc=%p poip=%x\n",
|
||||
bp, spc->spc_swp, spc->spc_swp->sw_flags,
|
||||
spc, spc->spc_swp->sw_poip);
|
||||
#endif
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: vm_glue.c,v 1.58 1996/10/10 17:16:20 christos Exp $ */
|
||||
/* $NetBSD: vm_glue.c,v 1.59 1996/10/12 21:50:08 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991, 1993
|
||||
@ -389,7 +389,7 @@ loop:
|
||||
}
|
||||
#ifdef DEBUG
|
||||
if (swapdebug & SDB_FOLLOW)
|
||||
kprintf("scheduler: running, procp %p pri %d\n", pp, ppri);
|
||||
printf("scheduler: running, procp %p pri %d\n", pp, ppri);
|
||||
#endif
|
||||
/*
|
||||
* Nothing to do, back to sleep
|
||||
@ -407,7 +407,7 @@ loop:
|
||||
if (cnt.v_free_count > atop(USPACE)) {
|
||||
#ifdef DEBUG
|
||||
if (swapdebug & SDB_SWAPIN)
|
||||
kprintf("swapin: pid %d(%s)@%p, pri %d free %d\n",
|
||||
printf("swapin: pid %d(%s)@%p, pri %d free %d\n",
|
||||
p->p_pid, p->p_comm, p->p_addr,
|
||||
ppri, cnt.v_free_count);
|
||||
#endif
|
||||
@ -420,7 +420,7 @@ loop:
|
||||
*/
|
||||
#ifdef DEBUG
|
||||
if (swapdebug & SDB_FOLLOW)
|
||||
kprintf("scheduler: no room for pid %d(%s), free %d\n",
|
||||
printf("scheduler: no room for pid %d(%s), free %d\n",
|
||||
p->p_pid, p->p_comm, cnt.v_free_count);
|
||||
#endif
|
||||
(void) splhigh();
|
||||
@ -428,7 +428,7 @@ loop:
|
||||
(void) spl0();
|
||||
#ifdef DEBUG
|
||||
if (swapdebug & SDB_FOLLOW)
|
||||
kprintf("scheduler: room again, free %d\n", cnt.v_free_count);
|
||||
printf("scheduler: room again, free %d\n", cnt.v_free_count);
|
||||
#endif
|
||||
goto loop;
|
||||
}
|
||||
@ -495,7 +495,7 @@ swapout_threads()
|
||||
p = outp2;
|
||||
#ifdef DEBUG
|
||||
if (swapdebug & SDB_SWAPOUT)
|
||||
kprintf("swapout_threads: no duds, try procp %p\n", p);
|
||||
printf("swapout_threads: no duds, try procp %p\n", p);
|
||||
#endif
|
||||
if (p)
|
||||
swapout(p);
|
||||
@ -511,7 +511,7 @@ swapout(p)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (swapdebug & SDB_SWAPOUT)
|
||||
kprintf("swapout: pid %d(%s)@%p, stat %x pri %d free %d\n",
|
||||
printf("swapout: pid %d(%s)@%p, stat %x pri %d free %d\n",
|
||||
p->p_pid, p->p_comm, p->p_addr, p->p_stat,
|
||||
p->p_slptime, cnt.v_free_count);
|
||||
#endif
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: vm_kern.c,v 1.19 1996/10/10 17:16:21 christos Exp $ */
|
||||
/* $NetBSD: vm_kern.c,v 1.20 1996/10/12 21:50:09 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991, 1993
|
||||
@ -242,7 +242,7 @@ kmem_suballoc(parent, min, max, size, pageable)
|
||||
ret = vm_map_find(parent, NULL, (vm_offset_t) 0,
|
||||
min, size, TRUE);
|
||||
if (ret != KERN_SUCCESS) {
|
||||
kprintf("kmem_suballoc: bad status return of %d.\n", ret);
|
||||
printf("kmem_suballoc: bad status return of %d.\n", ret);
|
||||
panic("kmem_suballoc");
|
||||
}
|
||||
*max = *min + size;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: vm_map.c,v 1.24 1996/10/10 17:16:22 christos Exp $ */
|
||||
/* $NetBSD: vm_map.c,v 1.25 1996/10/12 21:50:10 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991, 1993
|
||||
@ -1686,7 +1686,7 @@ vm_map_copy_entry(src_map, dst_map, src_entry, dst_entry)
|
||||
|
||||
if (dst_entry->object.vm_object != NULL &&
|
||||
(dst_entry->object.vm_object->flags & OBJ_INTERNAL) == 0)
|
||||
kprintf("vm_map_copy_entry: copying over permanent data!\n");
|
||||
printf("vm_map_copy_entry: copying over permanent data!\n");
|
||||
|
||||
/*
|
||||
* If our destination map was wired down,
|
||||
@ -2237,7 +2237,7 @@ vmspace_fork(vm1)
|
||||
old_entry->offset,
|
||||
FALSE, FALSE);
|
||||
if (check != KERN_SUCCESS)
|
||||
kprintf("vm_map_fork: copy in share_map region failed\n");
|
||||
printf("vm_map_fork: copy in share_map region failed\n");
|
||||
}
|
||||
else {
|
||||
vm_map_copy_entry(old_map, new_map, old_entry,
|
||||
@ -2581,7 +2581,7 @@ vm_map_print(map, full)
|
||||
register vm_map_t map;
|
||||
boolean_t full;
|
||||
{
|
||||
_vm_map_print(map, full, kprintf);
|
||||
_vm_map_print(map, full, printf);
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: vm_mmap.c,v 1.48 1996/10/10 17:16:23 christos Exp $ */
|
||||
/* $NetBSD: vm_mmap.c,v 1.49 1996/10/12 21:50:11 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
@ -149,7 +149,7 @@ sys_mmap(p, v, retval)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (mmapdebug & MDB_FOLLOW)
|
||||
kprintf("mmap(%d): addr %lx len %lx pro %x flg %x fd %d pos %lx\n",
|
||||
printf("mmap(%d): addr %lx len %lx pro %x flg %x fd %d pos %lx\n",
|
||||
p->p_pid, addr, size, prot, flags, fd, pos);
|
||||
#endif
|
||||
|
||||
@ -283,7 +283,7 @@ sys_msync(p, v, retval)
|
||||
size = (vm_size_t)SCARG(uap, len);
|
||||
#ifdef DEBUG
|
||||
if (mmapdebug & (MDB_FOLLOW|MDB_SYNC))
|
||||
kprintf("msync(%d): addr %lx len %lx\n",
|
||||
printf("msync(%d): addr %lx len %lx\n",
|
||||
p->p_pid, addr, size);
|
||||
#endif
|
||||
|
||||
@ -322,7 +322,7 @@ sys_msync(p, v, retval)
|
||||
}
|
||||
#ifdef DEBUG
|
||||
if (mmapdebug & MDB_SYNC)
|
||||
kprintf("msync: cleaning/flushing address range [%lx-%lx)\n",
|
||||
printf("msync: cleaning/flushing address range [%lx-%lx)\n",
|
||||
addr, addr+size);
|
||||
#endif
|
||||
/*
|
||||
@ -373,7 +373,7 @@ sys_munmap(p, v, retval)
|
||||
size = (vm_size_t) SCARG(uap, len);
|
||||
#ifdef DEBUG
|
||||
if (mmapdebug & MDB_FOLLOW)
|
||||
kprintf("munmap(%d): addr %lx len %lx\n",
|
||||
printf("munmap(%d): addr %lx len %lx\n",
|
||||
p->p_pid, addr, size);
|
||||
#endif
|
||||
|
||||
@ -417,7 +417,7 @@ munmapfd(p, fd)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
if (mmapdebug & MDB_FOLLOW)
|
||||
kprintf("munmapfd(%d): fd %d\n", p->p_pid, fd);
|
||||
printf("munmapfd(%d): fd %d\n", p->p_pid, fd);
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -446,7 +446,7 @@ sys_mprotect(p, v, retval)
|
||||
prot = SCARG(uap, prot) & VM_PROT_ALL;
|
||||
#ifdef DEBUG
|
||||
if (mmapdebug & MDB_FOLLOW)
|
||||
kprintf("mprotect(%d): addr %lx len %lx prot %d\n", p->p_pid,
|
||||
printf("mprotect(%d): addr %lx len %lx prot %d\n", p->p_pid,
|
||||
addr, size, prot);
|
||||
#endif
|
||||
/*
|
||||
@ -527,7 +527,7 @@ sys_mlock(p, v, retval)
|
||||
size = (vm_size_t)SCARG(uap, len);
|
||||
#ifdef DEBUG
|
||||
if (mmapdebug & MDB_FOLLOW)
|
||||
kprintf("mlock(%d): addr %lx len %lx\n",
|
||||
printf("mlock(%d): addr %lx len %lx\n",
|
||||
p->p_pid, addr, size);
|
||||
#endif
|
||||
/*
|
||||
@ -576,7 +576,7 @@ sys_munlock(p, v, retval)
|
||||
size = (vm_size_t)SCARG(uap, len);
|
||||
#ifdef DEBUG
|
||||
if (mmapdebug & MDB_FOLLOW)
|
||||
kprintf("munlock(%d): addr %lx len %lx\n",
|
||||
printf("munlock(%d): addr %lx len %lx\n",
|
||||
p->p_pid, addr, size);
|
||||
#endif
|
||||
/*
|
||||
@ -695,7 +695,7 @@ vm_mmap(map, addr, size, prot, maxprot, flags, handle, foff)
|
||||
(void) pager_cache(object, FALSE);
|
||||
#ifdef DEBUG
|
||||
if (mmapdebug & MDB_MAPIT)
|
||||
kprintf("vm_mmap(%d): ANON *addr %lx size %lx pager %p\n",
|
||||
printf("vm_mmap(%d): ANON *addr %lx size %lx pager %p\n",
|
||||
curproc->p_pid, *addr, size, pager);
|
||||
#endif
|
||||
}
|
||||
@ -725,7 +725,7 @@ vm_mmap(map, addr, size, prot, maxprot, flags, handle, foff)
|
||||
else {
|
||||
#ifdef DEBUG
|
||||
if (object == NULL)
|
||||
kprintf("vm_mmap: no object: vp %p, pager %p\n",
|
||||
printf("vm_mmap: no object: vp %p, pager %p\n",
|
||||
vp, pager);
|
||||
#endif
|
||||
/*
|
||||
@ -807,7 +807,7 @@ vm_mmap(map, addr, size, prot, maxprot, flags, handle, foff)
|
||||
PMAP_PREFER(foff, &paddr);
|
||||
#endif
|
||||
if (paddr != *addr)
|
||||
kprintf(
|
||||
printf(
|
||||
"vm_mmap: pmap botch! "
|
||||
"[foff %lx, addr %lx, paddr %lx]\n",
|
||||
foff, *addr, paddr);
|
||||
@ -880,7 +880,7 @@ vm_mmap(map, addr, size, prot, maxprot, flags, handle, foff)
|
||||
}
|
||||
#ifdef DEBUG
|
||||
if (mmapdebug & MDB_MAPIT)
|
||||
kprintf("vm_mmap(%d): FILE *addr %lx size %lx pager %p\n",
|
||||
printf("vm_mmap(%d): FILE *addr %lx size %lx pager %p\n",
|
||||
curproc->p_pid, *addr, size, pager);
|
||||
#endif
|
||||
}
|
||||
@ -910,7 +910,7 @@ vm_mmap(map, addr, size, prot, maxprot, flags, handle, foff)
|
||||
out:
|
||||
#ifdef DEBUG
|
||||
if (mmapdebug & MDB_MAPIT)
|
||||
kprintf("vm_mmap: rv %d\n", rv);
|
||||
printf("vm_mmap: rv %d\n", rv);
|
||||
#endif
|
||||
switch (rv) {
|
||||
case KERN_SUCCESS:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: vm_object.c,v 1.35 1996/10/10 17:16:24 christos Exp $ */
|
||||
/* $NetBSD: vm_object.c,v 1.36 1996/10/12 21:50:12 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991, 1993
|
||||
@ -476,7 +476,7 @@ again:
|
||||
* Will loose changes to the page.
|
||||
*/
|
||||
if (vm_pager_put(object->pager, p, syncio)) {
|
||||
kprintf("%s: pager_put error\n",
|
||||
printf("%s: pager_put error\n",
|
||||
"vm_object_page_clean");
|
||||
p->flags |= PG_CLEAN;
|
||||
noerror = FALSE;
|
||||
@ -1410,7 +1410,7 @@ vm_object_print(object, full)
|
||||
vm_object_t object;
|
||||
boolean_t full;
|
||||
{
|
||||
_vm_object_print(object, full, kprintf);
|
||||
_vm_object_print(object, full, printf);
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: vm_pager.c,v 1.22 1996/10/10 17:16:25 christos Exp $ */
|
||||
/* $NetBSD: vm_pager.c,v 1.23 1996/10/12 21:50:13 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991, 1993
|
||||
@ -340,7 +340,7 @@ vm_pager_unmap_pages(kva, npages)
|
||||
if (m->flags & PG_PAGEROWNED)
|
||||
m->flags &= ~PG_PAGEROWNED;
|
||||
else
|
||||
kprintf("vm_pager_unmap_pages: %p(%lx/%lx) not owned\n",
|
||||
printf("vm_pager_unmap_pages: %p(%lx/%lx) not owned\n",
|
||||
m, va, VM_PAGE_TO_PHYS(m));
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: vm_swap.c,v 1.33 1996/10/10 17:16:26 christos Exp $ */
|
||||
/* $NetBSD: vm_swap.c,v 1.34 1996/10/12 21:50:14 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1989, 1993
|
||||
@ -143,11 +143,11 @@ swapinit()
|
||||
panic("swapvp");
|
||||
#endif
|
||||
if (nswap == 0)
|
||||
kprintf("WARNING: no swap space found\n");
|
||||
printf("WARNING: no swap space found\n");
|
||||
else if ((error = swfree(p, 0)) == ENXIO)
|
||||
kprintf("WARNING: primary swap device not configured\n");
|
||||
printf("WARNING: primary swap device not configured\n");
|
||||
else if (error) {
|
||||
kprintf("swfree errno %d\n", error); /* XXX */
|
||||
printf("swfree errno %d\n", error); /* XXX */
|
||||
panic("swapinit swfree 0");
|
||||
}
|
||||
|
||||
@ -480,7 +480,7 @@ swfree(p, index)
|
||||
firstblk = rmalloc(swapmap, rootblks - ctod(CLSIZE));
|
||||
if (firstblk != ctod(CLSIZE))
|
||||
panic("swfree miniroot save");
|
||||
kprintf("Preserved %d blocks of miniroot leaving %d pages of swap\n",
|
||||
printf("Preserved %d blocks of miniroot leaving %d pages of swap\n",
|
||||
rootblks, dtoc(nblks - rootblks));
|
||||
}
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: vnode_pager.c,v 1.20 1996/10/10 17:16:26 christos Exp $ */
|
||||
/* $NetBSD: vnode_pager.c,v 1.21 1996/10/12 21:50:16 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990 University of Utah.
|
||||
@ -103,7 +103,7 @@ vnode_pager_init()
|
||||
{
|
||||
#ifdef DEBUG
|
||||
if (vpagerdebug & VDB_FOLLOW)
|
||||
kprintf("vnode_pager_init()\n");
|
||||
printf("vnode_pager_init()\n");
|
||||
#endif
|
||||
TAILQ_INIT(&vnode_pager_list);
|
||||
}
|
||||
@ -128,7 +128,7 @@ vnode_pager_alloc(handle, size, prot, foff)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (vpagerdebug & (VDB_FOLLOW|VDB_ALLOC))
|
||||
kprintf("vnode_pager_alloc(%p, %lx, %x)\n", handle, size, prot);
|
||||
printf("vnode_pager_alloc(%p, %lx, %x)\n", handle, size, prot);
|
||||
#endif
|
||||
/*
|
||||
* Pageout to vnode, no can do yet.
|
||||
@ -192,7 +192,7 @@ vnode_pager_alloc(handle, size, prot, foff)
|
||||
}
|
||||
#ifdef DEBUG
|
||||
if (vpagerdebug & VDB_ALLOC)
|
||||
kprintf("vnode_pager_setup: vp %p sz %lx pager %p object %p\n",
|
||||
printf("vnode_pager_setup: vp %p sz %lx pager %p object %p\n",
|
||||
vp, vnp->vnp_size, pager, object);
|
||||
#endif
|
||||
return(pager);
|
||||
@ -210,7 +210,7 @@ vnode_pager_dealloc(pager)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (vpagerdebug & VDB_FOLLOW)
|
||||
kprintf("vnode_pager_dealloc(%p)\n", pager);
|
||||
printf("vnode_pager_dealloc(%p)\n", pager);
|
||||
#endif
|
||||
if ((vp = vnp->vnp_vp) != NULL) {
|
||||
vp->v_vmdata = NULL;
|
||||
@ -236,7 +236,7 @@ vnode_pager_getpage(pager, mlist, npages, sync)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (vpagerdebug & VDB_FOLLOW)
|
||||
kprintf("vnode_pager_getpage(%p, %p, %x, %x)\n",
|
||||
printf("vnode_pager_getpage(%p, %p, %x, %x)\n",
|
||||
pager, mlist, npages, sync);
|
||||
#endif
|
||||
return(vnode_pager_io((vn_pager_t)pager->pg_data,
|
||||
@ -254,7 +254,7 @@ vnode_pager_putpage(pager, mlist, npages, sync)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (vpagerdebug & VDB_FOLLOW)
|
||||
kprintf("vnode_pager_putpage(%p, %p, %x, %x)\n",
|
||||
printf("vnode_pager_putpage(%p, %p, %x, %x)\n",
|
||||
pager, mlist, npages, sync);
|
||||
#endif
|
||||
if (pager == NULL)
|
||||
@ -285,7 +285,7 @@ vnode_pager_haspage(pager, offset)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (vpagerdebug & VDB_FOLLOW)
|
||||
kprintf("vnode_pager_haspage(%p, %lx)\n", pager, offset);
|
||||
printf("vnode_pager_haspage(%p, %lx)\n", pager, offset);
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -298,7 +298,7 @@ vnode_pager_haspage(pager, offset)
|
||||
VOP_UNLOCK(vnp->vnp_vp);
|
||||
#ifdef DEBUG
|
||||
if (vpagerdebug & (VDB_FAIL|VDB_SIZE))
|
||||
kprintf("vnode_pager_haspage: pg %p, off %lx, size %lx\n",
|
||||
printf("vnode_pager_haspage: pg %p, off %lx, size %lx\n",
|
||||
pager, offset, vnp->vnp_size);
|
||||
#endif
|
||||
return(FALSE);
|
||||
@ -318,7 +318,7 @@ vnode_pager_haspage(pager, offset)
|
||||
if (err) {
|
||||
#ifdef DEBUG
|
||||
if (vpagerdebug & VDB_FAIL)
|
||||
kprintf("vnode_pager_haspage: BMAP err %d, pg %p, off %lx\n",
|
||||
printf("vnode_pager_haspage: BMAP err %d, pg %p, off %lx\n",
|
||||
err, pager, offset);
|
||||
#endif
|
||||
return(TRUE);
|
||||
@ -338,7 +338,7 @@ vnode_pager_cluster(pager, offset, loffset, hoffset)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (vpagerdebug & VDB_FOLLOW)
|
||||
kprintf("vnode_pager_cluster(%p, %lx) ", pager, offset);
|
||||
printf("vnode_pager_cluster(%p, %lx) ", pager, offset);
|
||||
#endif
|
||||
loff = offset;
|
||||
if (loff >= vnp->vnp_size)
|
||||
@ -354,7 +354,7 @@ vnode_pager_cluster(pager, offset, loffset, hoffset)
|
||||
*hoffset = hoff;
|
||||
#ifdef DEBUG
|
||||
if (vpagerdebug & VDB_FOLLOW)
|
||||
kprintf("returns [%lx-%lx]\n", loff, hoff);
|
||||
printf("returns [%lx-%lx]\n", loff, hoff);
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -403,7 +403,7 @@ vnode_pager_setsize(vp, nsize)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (vpagerdebug & (VDB_FOLLOW|VDB_SIZE))
|
||||
kprintf("vnode_pager_setsize: vp %p obj %p osz %ld nsz %ld\n",
|
||||
printf("vnode_pager_setsize: vp %p obj %p osz %ld nsz %ld\n",
|
||||
vp, object, vnp->vnp_size, nsize);
|
||||
#endif
|
||||
/*
|
||||
@ -522,7 +522,7 @@ vnode_pager_io(vnp, mlist, npages, sync, rw)
|
||||
|
||||
#ifdef DEBUG
|
||||
if (vpagerdebug & VDB_FOLLOW)
|
||||
kprintf("vnode_pager_io(%p, %p, %c): vnode %p\n",
|
||||
printf("vnode_pager_io(%p, %p, %c): vnode %p\n",
|
||||
vnp, m, rw == UIO_READ ? 'R' : 'W', vnp->vnp_vp);
|
||||
#endif
|
||||
foff = m->offset + m->object->paging_offset;
|
||||
@ -545,7 +545,7 @@ vnode_pager_io(vnp, mlist, npages, sync, rw)
|
||||
vm_pager_unmap_pages(kva, npages);
|
||||
#ifdef DEBUG
|
||||
if (vpagerdebug & VDB_SIZE)
|
||||
kprintf("vnode_pager_io: vp %p, off %ld size %ld\n",
|
||||
printf("vnode_pager_io: vp %p, off %ld size %ld\n",
|
||||
vnp->vnp_vp, foff, vnp->vnp_size);
|
||||
#endif
|
||||
return(VM_PAGER_BAD);
|
||||
@ -565,7 +565,7 @@ vnode_pager_io(vnp, mlist, npages, sync, rw)
|
||||
auio.uio_procp = (struct proc *)0;
|
||||
#ifdef DEBUG
|
||||
if (vpagerdebug & VDB_IO)
|
||||
kprintf("vnode_pager_io: vp %p kva %lx foff %lx size %x",
|
||||
printf("vnode_pager_io: vp %p kva %lx foff %lx size %x",
|
||||
vnp->vnp_vp, kva, foff, size);
|
||||
#endif
|
||||
if (rw == UIO_READ)
|
||||
@ -576,9 +576,9 @@ vnode_pager_io(vnp, mlist, npages, sync, rw)
|
||||
#ifdef DEBUG
|
||||
if (vpagerdebug & VDB_IO) {
|
||||
if (error || auio.uio_resid)
|
||||
kprintf(" returns error %x, resid %x",
|
||||
printf(" returns error %x, resid %x",
|
||||
error, auio.uio_resid);
|
||||
kprintf("\n");
|
||||
printf("\n");
|
||||
}
|
||||
#endif
|
||||
if (!error) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user