alloc tables at boot time version

[unix-history] / usr / src / sys / kern / init_main.c

diff --git a/usr/src/sys/kern/init_main.c b/usr/src/sys/kern/init_main.c
index a3f5660..8708686 100644 (file)
--- a/usr/src/sys/kern/init_main.c
+++ b/usr/src/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*     init_main.c     4.2     %G%     */
+/*     init_main.c     4.10    %G%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -19,6 +19,7 @@
 #include "../h/cmap.h"
 #include "../h/text.h"
 #include "../h/vlimit.h"
 #include "../h/cmap.h"
 #include "../h/text.h"
 #include "../h/vlimit.h"

+#include "../h/clist.h"

 
 /*
  * Initialization code.
 
 /*
  * Initialization code.


@@ -40,11 +41,9 @@
 main(firstaddr)
 {
        register int i;
 main(firstaddr)
 {
        register int i;

+       register struct proc *p;

 
 

-       cpusid = mfpr(SID);             /* get system identification */
-#ifdef FASTVAX

        rqinit();
        rqinit();

-#endif

        startup(firstaddr);
        if (lotsfree == 0)
                lotsfree = LOTSFREE;
        startup(firstaddr);
        if (lotsfree == 0)
                lotsfree = LOTSFREE;


@@ -52,14 +51,15 @@ main(firstaddr)
        /*
         * set up system process 0 (swapper)
         */
        /*
         * set up system process 0 (swapper)
         */

-
-       proc[0].p_p0br = (struct pte *)mfpr(P0BR);
-       proc[0].p_szpt = 1;
-       proc[0].p_addr = uaddr(&proc[0]);
-       proc[0].p_stat = SRUN;
-       proc[0].p_flag |= SLOAD|SSYS;
-       proc[0].p_nice = NZERO;
-       u.u_procp = &proc[0];
+       p = &proc[0];
+       p->p_p0br = (struct pte *)mfpr(P0BR);
+       p->p_szpt = 1;
+       p->p_addr = uaddr(p);
+       p->p_stat = SRUN;
+       p->p_flag |= SLOAD|SSYS;
+       p->p_nice = NZERO;
+       setredzone(p->p_addr, (caddr_t)&u);
+       u.u_procp = p;

        u.u_cmask = CMASK;
        for (i = 1; i < sizeof(u.u_limit)/sizeof(u.u_limit[0]); i++)
                switch (i) {
        u.u_cmask = CMASK;
        for (i = 1; i < sizeof(u.u_limit)/sizeof(u.u_limit[0]); i++)
                switch (i) {


@@ -97,17 +97,17 @@ main(firstaddr)
 
        /*
         * make page-out daemon (process 2)
 
        /*
         * make page-out daemon (process 2)

-        * the daemon has ctopt(NSWBUF*CLSIZE*KLMAX) pages of page
+        * the daemon has ctopt(nswbuf*CLSIZE*KLMAX) pages of page

         * table so that it can map dirty pages into
         * its address space during asychronous pushes.
         */
 
        mpid = 1;
         * table so that it can map dirty pages into
         * its address space during asychronous pushes.
         */
 
        mpid = 1;

-       proc[0].p_szpt = clrnd(ctopt(NSWBUF*CLSIZE*KLMAX + UPAGES));
+       proc[0].p_szpt = clrnd(ctopt(nswbuf*CLSIZE*KLMAX + UPAGES));

        proc[1].p_stat = SZOMB;         /* force it to be in proc slot 2 */
        if (newproc(0)) {
                proc[2].p_flag |= SLOAD|SSYS;
        proc[1].p_stat = SZOMB;         /* force it to be in proc slot 2 */
        if (newproc(0)) {
                proc[2].p_flag |= SLOAD|SSYS;

-               proc[2].p_dsize = u.u_dsize = NSWBUF*CLSIZE*KLMAX; 
+               proc[2].p_dsize = u.u_dsize = nswbuf*CLSIZE*KLMAX; 

                pageout();
        }
 
                pageout();
        }
 


@@ -145,19 +145,18 @@ main(firstaddr)
  */
 iinit()
 {
  */
 iinit()
 {

-       register struct buf *cp, *bp;
+       register struct buf *bp;

        register struct filsys *fp;
 
        (*bdevsw[major(rootdev)].d_open)(rootdev, 1);
        bp = bread(rootdev, SUPERB);
        register struct filsys *fp;
 
        (*bdevsw[major(rootdev)].d_open)(rootdev, 1);
        bp = bread(rootdev, SUPERB);

-       cp = geteblk();

        if(u.u_error)
                panic("iinit");
        if(u.u_error)
                panic("iinit");

-       bcopy(bp->b_un.b_addr, cp->b_un.b_addr, sizeof(struct filsys));
+       bp->b_flags |= B_LOCKED;                /* block can never be re-used */

        brelse(bp);
        brelse(bp);

-       mount[0].m_bufp = cp;

        mount[0].m_dev = rootdev;
        mount[0].m_dev = rootdev;

-       fp = cp->b_un.b_filsys;
+       mount[0].m_bufp = bp;
+       fp = bp->b_un.b_filsys;

        fp->s_flock = 0;
        fp->s_ilock = 0;
        fp->s_ronly = 0;
        fp->s_flock = 0;
        fp->s_ilock = 0;
        fp->s_ronly = 0;


@@ -167,19 +166,6 @@ iinit()
        bootime = time;
 }
 
        bootime = time;
 }
 

-/*
- * This is the set of buffers proper, whose heads
- * were declared in buf.h.  There can exist buffer
- * headers not pointing here that are used purely
- * as arguments to the I/O routines to describe
- * I/O to be done-- e.g. swap headers swbuf[] for
- * swapping.
- *
- * These are actually allocated kernel map slots and space is
- * allocated in locore.s for them.
- */
-char   buffers[NBUF][BSIZE];
-

 /*
  * Initialize the buffer I/O system by freeing
  * all buffers and setting all device buffer lists to empty.
 /*
  * Initialize the buffer I/O system by freeing
  * all buffers and setting all device buffer lists to empty.


@@ -192,27 +178,24 @@ binit()
        struct bdevsw *bdp;
        struct swdevt *swp;
 
        struct bdevsw *bdp;
        struct swdevt *swp;
 

-       bfreelist.b_forw = bfreelist.b_back =
-           bfreelist.av_forw = bfreelist.av_back = &bfreelist;
-       for (i=0; i<NBUF; i++) {
+       for (dp = bfreelist; dp < &bfreelist[BQUEUES]; dp++) {
+               dp->b_forw = dp->b_back = dp->av_forw = dp->av_back = dp;
+               dp->b_flags = B_HEAD;
+       }
+       dp--;                           /* dp = &bfreelist[BQUEUES-1]; */
+       for (i=0; i<nbuf; i++) {

                bp = &buf[i];
                bp->b_dev = NODEV;
                bp = &buf[i];
                bp->b_dev = NODEV;

-               bp->b_un.b_addr = buffers[i];
-               bp->b_back = &bfreelist;
-               bp->b_forw = bfreelist.b_forw;
-               bfreelist.b_forw->b_back = bp;
-               bfreelist.b_forw = bp;
-               bp->b_flags = B_BUSY;
+               bp->b_un.b_addr = buffers + i * BSIZE;
+               bp->b_back = dp;
+               bp->b_forw = dp->b_forw;
+               dp->b_forw->b_back = bp;
+               dp->b_forw = bp;
+               bp->b_flags = B_BUSY|B_INVAL;

                brelse(bp);
        }
                brelse(bp);
        }

-       for (bdp = bdevsw; bdp->d_open; bdp++) {
-               dp = bdp->d_tab;
-               if(dp) {
-                       dp->b_forw = dp;
-                       dp->b_back = dp;
-               }
+       for (bdp = bdevsw; bdp->d_open; bdp++)

                nblkdev++;
                nblkdev++;

-       }

        /*
         * Count swap devices, and adjust total swap space available.
         * Some of this space will not be available until a vswapon()
        /*
         * Count swap devices, and adjust total swap space available.
         * Some of this space will not be available until a vswapon()


@@ -237,9 +220,33 @@ binit()
 bswinit()
 {
        register int i;
 bswinit()
 {
        register int i;

+       register struct buf *sp = swbuf;
+
+       bswlist.av_forw = sp;
+       for (i=0; i<nswbuf-1; i++, sp++)
+               sp->av_forw = sp+1;
+       sp->av_forw = NULL;
+}

 
 

-       bswlist.av_forw = &swbuf[0];
-       for (i=0; i<NSWBUF-1; i++)
-               swbuf[i].av_forw = &swbuf[i+1];
-       swbuf[NSWBUF-1].av_forw = NULL;
+/*
+ * Initialize clist by freeing all character blocks, then count
+ * number of character devices. (Once-only routine)
+ */
+cinit()
+{
+       register int ccp;
+       register struct cblock *cp;
+       register struct cdevsw *cdp;
+
+       ccp = (int)cfree;
+       ccp = (ccp+CROUND) & ~CROUND;
+       for(cp=(struct cblock *)ccp; cp < &cfree[nclist-1]; cp++) {
+               cp->c_next = cfreelist;
+               cfreelist = cp;
+               cfreecount += CBSIZE;
+       }
+       ccp = 0;
+       for(cdp = cdevsw; cdp->d_open; cdp++)
+               ccp++;
+       nchrdev = ccp;

 }
 }