merge with calder

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

diff --git a/usr/src/sys/kern/kern_proc.c b/usr/src/sys/kern/kern_proc.c
index 8057815..8ca8023 100644 (file)
--- a/usr/src/sys/kern/kern_proc.c
+++ b/usr/src/sys/kern/kern_proc.c
@@ -1,4 +1,4 @@
-/*     kern_proc.c     4.15    81/11/18        */
+/*     kern_proc.c     4.28    82/07/24        */

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


@@ -19,6 +19,8 @@
 #include "../h/psl.h"
 #include "../h/vlimit.h"
 #include "../h/file.h"
 #include "../h/psl.h"
 #include "../h/vlimit.h"
 #include "../h/file.h"

+#include "../h/quota.h"
+#include "../h/descrip.h"

 
 /*
  * exec system call, with and without environments.
 
 /*
  * exec system call, with and without environments.


@@ -46,10 +48,10 @@ exece()
        char *sharg;
        struct inode *ip;
        swblk_t bno;
        char *sharg;
        struct inode *ip;
        swblk_t bno;

-       char cfname[DIRSIZ];
+       char cfname[MAXNAMLEN + 1];

        char cfarg[SHSIZE];
 
        char cfarg[SHSIZE];
 

-       if ((ip = namei(uchar, 0)) == NULL)
+       if ((ip = namei(uchar, 0, 1)) == NULL)

                return;
        bno = 0;
        bp = 0;
                return;
        bno = 0;
        bp = 0;


@@ -94,8 +96,8 @@ exece()
        u.u_segflg = 0;
        if (u.u_error)
                goto bad;
        u.u_segflg = 0;
        if (u.u_error)
                goto bad;

-       if (u.u_count > sizeof(u.u_exdata) - sizeof(u.u_exdata.Ux_A)
-               && u.u_exdata.ux_shell[0] != '#') {
+       if (u.u_count > sizeof(u.u_exdata) - sizeof(u.u_exdata.Ux_A) &&
+           u.u_exdata.ux_shell[0] != '#') {

                u.u_error = ENOEXEC;
                goto bad;
        }
                u.u_error = ENOEXEC;
                goto bad;
        }


@@ -151,10 +153,11 @@ exece()
                                sharg = cfarg;
                        }
                }
                                sharg = cfarg;
                        }
                }

-               bcopy((caddr_t)u.u_dbuf, (caddr_t)cfname, DIRSIZ);
+               bcopy((caddr_t)u.u_dent.d_name, (caddr_t)cfname,
+                   u.u_dent.d_namlen + 1);

                indir = 1;
                iput(ip);
                indir = 1;
                iput(ip);

-               ip = namei(schar, 0);
+               ip = namei(schar, 0, 1);

                if (ip == NULL)
                        return;
                goto again;
                if (ip == NULL)
                        return;
                goto again;


@@ -188,7 +191,7 @@ exece()
                        uap->envp++;
                        ne++;
                }
                        uap->envp++;
                        ne++;
                }

-               if (ap==NULL)
+               if (ap == NULL)

                        break;
                na++;
                if (ap == -1)
                        break;
                na++;
                if (ap == -1)


@@ -206,28 +209,31 @@ exece()
                                bp = 0;
                                goto badarg;
                        }
                                bp = 0;
                                goto badarg;
                        }

-                       if ((nc&BMASK) == 0) {
+                       if (nc % (CLSIZE*NBPG) == 0) {

                                if (bp)
                                        bdwrite(bp);
                                if (bp)
                                        bdwrite(bp);

-                               bp = getblk(argdev,
-                                   (daddr_t)(dbtofsb(bno)+(nc>>BSHIFT)));
+                               bp = getblk(argdev, bno + nc / NBPG,
+                                   CLSIZE*NBPG);

                                cp = bp->b_un.b_addr;
                        }
                        nc++;
                        *cp++ = c;
                                cp = bp->b_un.b_addr;
                        }
                        nc++;
                        *cp++ = c;

-               } while (c>0);
+               } while (c > 0);

        }
        if (bp)
                bdwrite(bp);
        bp = 0;
        nc = (nc + NBPW-1) & ~(NBPW-1);
        }
        if (bp)
                bdwrite(bp);
        bp = 0;
        nc = (nc + NBPW-1) & ~(NBPW-1);

-       if (indir)
-               bcopy((caddr_t)cfname, (caddr_t)u.u_dbuf, DIRSIZ);
+       if (indir) {
+               u.u_dent.d_namlen = strlen(cfname);
+               bcopy((caddr_t)cfname, (caddr_t)u.u_dent.d_name,
+                   u.u_dent.d_namlen + 1);
+       }

        getxfile(ip, nc + (na+4)*NBPW, uid, gid);
        if (u.u_error) {
 badarg:
        getxfile(ip, nc + (na+4)*NBPW, uid, gid);
        if (u.u_error) {
 badarg:

-               for (c = 0; c < nc; c += BSIZE)
-                       if (bp = baddr(argdev, dbtofsb(bno)+(c>>BSHIFT))) {
+               for (c = 0; c < nc; c += CLSIZE*NBPG)
+                       if (bp = baddr(argdev, bno + c / NBPG, CLSIZE*NBPG)) {

                                bp->b_flags |= B_AGE;           /* throw away */
                                bp->b_flags &= ~B_DELWRI;       /* cancel io */
                                brelse(bp);
                                bp->b_flags |= B_AGE;           /* throw away */
                                bp->b_flags &= ~B_DELWRI;       /* cancel io */
                                brelse(bp);


@@ -254,11 +260,11 @@ badarg:
                        break;
                (void) suword((caddr_t)ap, ucp);
                do {
                        break;
                (void) suword((caddr_t)ap, ucp);
                do {

-                       if ((nc&BMASK) == 0) {
+                       if (nc % (CLSIZE*NBPG) == 0) {

                                if (bp)
                                        brelse(bp);
                                if (bp)
                                        brelse(bp);

-                               bp = bread(argdev,
-                                   (daddr_t)(dbtofsb(bno)+(nc>>BSHIFT)));
+                               bp = bread(argdev, bno + nc / NBPG,
+                                   CLSIZE*NBPG);

                                bp->b_flags |= B_AGE;           /* throw away */
                                bp->b_flags &= ~B_DELWRI;       /* cancel io */
                                cp = bp->b_un.b_addr;
                                bp->b_flags |= B_AGE;           /* throw away */
                                bp->b_flags &= ~B_DELWRI;       /* cancel io */
                                cp = bp->b_un.b_addr;


@@ -296,9 +302,8 @@ register struct inode *ip;
                register struct file *fp;
 
                for (fp = file; fp < fileNFILE; fp++) {
                register struct file *fp;
 
                for (fp = file; fp < fileNFILE; fp++) {

-                       if (fp->f_flag & FSOCKET)
-                               continue;
-                       if (fp->f_inode == ip && (fp->f_flag&FWRITE)) {
+                       if (fp->f_type == DTYPE_FILE &&
+                           fp->f_inode == ip && (fp->f_flag&FWRITE)) {

                                u.u_error = ETXTBSY;
                                goto bad;
                        }
                                u.u_error = ETXTBSY;
                                goto bad;
                        }


@@ -372,6 +377,7 @@ register struct inode *ip;
                u.u_uid = uid;
                u.u_procp->p_uid = uid;
                u.u_gid = gid;
                u.u_uid = uid;
                u.u_procp->p_uid = uid;
                u.u_gid = gid;

+               u.u_grps[gid/(sizeof(int)*8)] |= 1 << (gid%(sizeof(int)*8));

        } else
                psignal(u.u_procp, SIGTRAP);
        u.u_tsize = ts;
        } else
                psignal(u.u_procp, SIGTRAP);
        u.u_tsize = ts;


@@ -390,7 +396,7 @@ setregs()
        register i;
        long sigmask;
 
        register i;
        long sigmask;
 

-       for (rp = &u.u_signal[0], sigmask = 1L; rp < &u.u_signal[NSIG];
+       for (rp = &u.u_signal[1], sigmask = 1L; rp < &u.u_signal[NSIG];

            sigmask <<= 1, rp++) {
                switch (*rp) {
 
            sigmask <<= 1, rp++) {
                switch (*rp) {
 


@@ -408,7 +414,7 @@ setregs()
                        if ((int)*rp & 1)
                                u.u_procp->p_siga0 |= sigmask;
                        else
                        if ((int)*rp & 1)
                                u.u_procp->p_siga0 |= sigmask;
                        else

-                               u.u_procp->p_siga1 &= ~sigmask;
+                               u.u_procp->p_siga0 &= ~sigmask;

                        if ((int)*rp & 2)
                                u.u_procp->p_siga1 |= sigmask;
                        else
                        if ((int)*rp & 2)
                                u.u_procp->p_siga1 |= sigmask;
                        else


@@ -424,7 +430,7 @@ setregs()
        u.u_ar0[PC] = u.u_exdata.ux_entloc + 2; /* skip over entry mask */
        for (i=0; i<NOFILE; i++) {
                if (u.u_pofile[i]&EXCLOSE) {
        u.u_ar0[PC] = u.u_exdata.ux_entloc + 2; /* skip over entry mask */
        for (i=0; i<NOFILE; i++) {
                if (u.u_pofile[i]&EXCLOSE) {

-                       closef(u.u_ofile[i]);
+                       closef(u.u_ofile[i], 1);

                        u.u_ofile[i] = NULL;
                        u.u_pofile[i] &= ~EXCLOSE;
                }
                        u.u_ofile[i] = NULL;
                        u.u_pofile[i] &= ~EXCLOSE;
                }


@@ -434,7 +440,8 @@ setregs()
         * Remember file name for accounting.
         */
        u.u_acflag &= ~AFORK;
         * Remember file name for accounting.
         */
        u.u_acflag &= ~AFORK;

-       bcopy((caddr_t)u.u_dbuf, (caddr_t)u.u_comm, DIRSIZ);
+       bcopy((caddr_t)u.u_dent.d_name, (caddr_t)u.u_comm,
+           u.u_dent.d_namlen + 1);

 }
 
 /*
 }
 
 /*


@@ -502,7 +509,7 @@ exit(rv)
        for (i=0; i<NOFILE; i++) {
                f = u.u_ofile[i];
                u.u_ofile[i] = NULL;
        for (i=0; i<NOFILE; i++) {
                f = u.u_ofile[i];
                u.u_ofile[i] = NULL;

-               closef(f);
+               closef(f, 1);

        }
        ilock(u.u_cdir);
        iput(u.u_cdir);
        }
        ilock(u.u_cdir);
        iput(u.u_cdir);


@@ -512,8 +519,12 @@ exit(rv)
        }
        u.u_limit[LIM_FSIZE] = INFINITY;
        acct();
        }
        u.u_limit[LIM_FSIZE] = INFINITY;
        acct();

+#ifdef QUOTA
+       qclean();
+#endif

        vrelpt(u.u_procp);
        vrelu(u.u_procp, 0);
        vrelpt(u.u_procp);
        vrelu(u.u_procp, 0);

+       (void) spl5();          /* hack for mem alloc race XXX */

        multprog--;
        p->p_stat = SZOMB;
        noproc = 1;
        multprog--;
        p->p_stat = SZOMB;
        noproc = 1;


@@ -537,6 +548,16 @@ done:
        vmsadd(&((struct xproc *)p)->xp_vm, &u.u_cvm);
        for (q = proc; q < procNPROC; q++)
                if (q->p_pptr == p) {
        vmsadd(&((struct xproc *)p)->xp_vm, &u.u_cvm);
        for (q = proc; q < procNPROC; q++)
                if (q->p_pptr == p) {

+                       if (q->p_osptr)
+                               q->p_osptr->p_ysptr = q->p_ysptr;
+                       if (q->p_ysptr)
+                               q->p_ysptr->p_osptr = q->p_osptr;
+                       if (proc[1].p_cptr)
+                               proc[1].p_cptr->p_ysptr = q;
+                       q->p_osptr = proc[1].p_cptr;
+                       q->p_ysptr = NULL;
+                       proc[1].p_cptr = q;
+

                        q->p_pptr = &proc[1];
                        q->p_ppid = 1;
                        wakeup((caddr_t)&proc[1]);
                        q->p_pptr = &proc[1];
                        q->p_ppid = 1;
                        wakeup((caddr_t)&proc[1]);


@@ -557,13 +578,12 @@ done:
                        }
                        /*
                         * Protect this process from future
                        }
                        /*
                         * Protect this process from future

-                        * tty signals, clear TSTP/TTIN/TTOU if pending,
-                        * and set SDETACH bit on procs.
+                        * tty signals, clear TSTP/TTIN/TTOU if pending.

                         */
                        (void) spgrp(q, -1);
                }
                         */
                        (void) spgrp(q, -1);
                }

-       wakeup((caddr_t)p->p_pptr);

        psignal(p->p_pptr, SIGCHLD);
        psignal(p->p_pptr, SIGCHLD);

+       wakeup((caddr_t)p->p_pptr);

        swtch();
 }
 
        swtch();
 }
 


@@ -595,7 +615,7 @@ wait1(options, vp)
        struct vtimes *vp;
 {
        register f;
        struct vtimes *vp;
 {
        register f;

-       register struct proc *p;
+       register struct proc *p, *q;

 
        f = 0;
 loop:
 
        f = 0;
 loop:


@@ -613,7 +633,16 @@ loop:
                        p->p_stat = NULL;
                        p->p_pid = 0;
                        p->p_ppid = 0;
                        p->p_stat = NULL;
                        p->p_pid = 0;
                        p->p_ppid = 0;

+                       if (q = p->p_ysptr)
+                               q->p_osptr = p->p_osptr;
+                       if (q = p->p_osptr)
+                               q->p_ysptr = p->p_ysptr;
+                       if ((q = p->p_pptr)->p_cptr == p)
+                               q->p_cptr = p->p_osptr;

                        p->p_pptr = 0;
                        p->p_pptr = 0;

+                       p->p_ysptr = 0;
+                       p->p_osptr = 0;
+                       p->p_cptr = 0;

                        p->p_sig = 0;
                        p->p_siga0 = 0;
                        p->p_siga1 = 0;
                        p->p_sig = 0;
                        p->p_siga0 = 0;
                        p->p_siga1 = 0;


@@ -665,17 +694,32 @@ fork()
 fork1(isvfork)
 {
        register struct proc *p1, *p2;
 fork1(isvfork)
 {
        register struct proc *p1, *p2;

+#ifndef        QUOTA

        register a;
 
        a = 0;
        register a;
 
        a = 0;

+#else
+       if (u.u_quota != NOQUOT && u.u_quota->q_plim &&
+           u.u_quota->q_cnt >= u.u_quota->q_plim) {
+               u.u_error = EPROCLIM;
+               return;
+       }
+#endif

        p2 = NULL;
        for (p1 = proc; p1 < procNPROC; p1++) {
        p2 = NULL;
        for (p1 = proc; p1 < procNPROC; p1++) {

+#ifdef QUOTA
+               if (p1->p_stat == NULL) {
+                       p2 = p1;
+                       break;
+               }
+#else

                if (p1->p_stat==NULL && p2==NULL)
                        p2 = p1;
                else {
                        if (p1->p_uid==u.u_uid && p1->p_stat!=NULL)
                                a++;
                }
                if (p1->p_stat==NULL && p2==NULL)
                        p2 = p1;
                else {
                        if (p1->p_uid==u.u_uid && p1->p_stat!=NULL)
                                a++;
                }

+#endif

        }
        /*
         * Disallow if
        }
        /*
         * Disallow if


@@ -685,7 +729,11 @@ fork1(isvfork)
         */
        if (p2==NULL)
                tablefull("proc");
         */
        if (p2==NULL)
                tablefull("proc");

+#ifdef QUOTA
+       if (p2==NULL || (u.u_uid!=0 && p2==procNPROC-1)) {
+#else

        if (p2==NULL || (u.u_uid!=0 && (p2==procNPROC-1 || a>MAXUPRC))) {
        if (p2==NULL || (u.u_uid!=0 && (p2==procNPROC-1 || a>MAXUPRC))) {

+#endif

                u.u_error = EAGAIN;
                if (!isvfork) {
                        (void) vsexpand(0, &u.u_cdmap, 1);
                u.u_error = EAGAIN;
                if (!isvfork) {
                        (void) vsexpand(0, &u.u_cdmap, 1);


@@ -699,6 +747,9 @@ fork1(isvfork)
                u.u_r.r_val2 = 1;  /* child */
                u.u_start = time;
                u.u_acflag = AFORK;
                u.u_r.r_val2 = 1;  /* child */
                u.u_start = time;
                u.u_acflag = AFORK;

+#ifdef QUOTA
+               u.u_qflags &= ~QUF_LOGIN;
+#endif

                return;
        }
        u.u_r.r_val1 = p2->p_pid;
                return;
        }
        u.u_r.r_val1 = p2->p_pid;


@@ -707,35 +758,49 @@ out:
        u.u_r.r_val2 = 0;
 }
 
        u.u_r.r_val2 = 0;
 }
 

+spgrp(top, npgrp)
+register struct proc *top;
+{
+       register struct proc *pp, *p;
+       int f = 0;
+
+       for (p = top; npgrp == -1 || u.u_uid == p->p_uid ||
+           !u.u_uid || inferior(p); p = pp) {
+               if (npgrp == -1) {
+#define        bit(a)  (1<<(a-1))
+                       p->p_sig &= ~(bit(SIGTSTP)|bit(SIGTTIN)|bit(SIGTTOU));
+               } else
+                       p->p_pgrp = npgrp;
+               f++;
+               /*
+                * Search for children.
+                */
+               for (pp = proc; pp < procNPROC; pp++)
+                       if (pp->p_pptr == p)
+                               goto cont;
+               /*
+                * Search for siblings.
+                */
+               for (; p != top; p = p->p_pptr)
+                       for (pp = p + 1; pp < procNPROC; pp++)
+                               if (pp->p_pptr == p->p_pptr)
+                                       goto cont;
+               break;
+       cont:
+               ;
+       }
+       return (f);
+}
+

 /*
 /*

- * break system call.
- *  -- bad planning: "break" is a dirty word in C.
+ * Is p an inferior of the current process?

  */
  */

-sbreak()
+inferior(p)
+register struct proc *p;

 {
 {

-       struct a {
-               char    *nsiz;
-       };
-       register int n, d;
-
-       /*
-        * set n to new data size
-        * set d to new-old
-        */

 
 

-       n = btoc(((struct a *)u.u_ap)->nsiz);
-       if (!u.u_sep)
-               n -= ctos(u.u_tsize) * stoc(1);
-       if (n < 0)
-               n = 0;
-       d = clrnd(n - u.u_dsize);
-       if (ctob(u.u_dsize+d) > u.u_limit[LIM_DATA]) {
-               u.u_error = ENOMEM;
-               return;
-       }
-       if (chksize(u.u_tsize, u.u_dsize+d, u.u_ssize))
-               return;
-       if (swpexpand(u.u_dsize+d, u.u_ssize, &u.u_dmap, &u.u_smap)==0)
-               return;
-       expand(d, P0BR);
+       for (; p != u.u_procp; p = p->p_pptr)
+               if (p->p_ppid == 0)
+                       return (0);
+       return (1);

 }
 }