clean up event handling so that events that do longjmp's don't turn

[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 903b0f3..dc1a150 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.27    82/07/22        */
+/*     kern_proc.c     4.34    82/08/22        */

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


@@ -20,6 +20,8 @@
 #include "../h/vlimit.h"
 #include "../h/file.h"
 #include "../h/quota.h"
 #include "../h/vlimit.h"
 #include "../h/file.h"
 #include "../h/quota.h"

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

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


@@ -49,6 +51,7 @@ exece()
        swblk_t bno;
        char cfname[MAXNAMLEN + 1];
        char cfarg[SHSIZE];
        swblk_t bno;
        char cfname[MAXNAMLEN + 1];
        char cfarg[SHSIZE];

+       int resid;

 
        if ((ip = namei(uchar, 0, 1)) == NULL)
                return;
 
        if ((ip = namei(uchar, 0, 1)) == NULL)
                return;


@@ -87,19 +90,18 @@ exece()
         * ONLY ONE ARGUMENT MAY BE PASSED TO THE SHELL FROM
         * THE ASCII LINE.
         */
         * ONLY ONE ARGUMENT MAY BE PASSED TO THE SHELL FROM
         * THE ASCII LINE.
         */

-       u.u_base = (caddr_t)&u.u_exdata;
-       u.u_count = sizeof(u.u_exdata);
-       u.u_offset = 0;
-       u.u_segflg = 1;
-       readi(ip);
-       u.u_segflg = 0;
+       u.u_error = rdwri(UIO_READ, ip, (caddr_t)&u.u_exdata, sizeof (u.u_exdata),
+           0, 1, &resid);

        if (u.u_error)
                goto bad;
        if (u.u_error)
                goto bad;

+       u.u_count = resid;
+#ifndef lint

        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;
        }
        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;
        }

+#endif

        switch (u.u_exdata.ux_mag) {
 
        case 0407:
        switch (u.u_exdata.ux_mag) {
 
        case 0407:


@@ -153,7 +155,7 @@ exece()
                        }
                }
                bcopy((caddr_t)u.u_dent.d_name, (caddr_t)cfname,
                        }
                }
                bcopy((caddr_t)u.u_dent.d_name, (caddr_t)cfname,

-                   u.u_dent.d_namlen + 1);
+                   (unsigned)(u.u_dent.d_namlen + 1));

                indir = 1;
                iput(ip);
                ip = namei(schar, 0, 1);
                indir = 1;
                iput(ip);
                ip = namei(schar, 0, 1);


@@ -226,7 +228,7 @@ exece()
        if (indir) {
                u.u_dent.d_namlen = strlen(cfname);
                bcopy((caddr_t)cfname, (caddr_t)u.u_dent.d_name,
        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);
+                   (unsigned)(u.u_dent.d_namlen + 1));

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


@@ -301,9 +303,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;
                        }


@@ -352,15 +353,12 @@ register struct inode *ip;
        u.u_smap = u.u_csmap;
        vgetvm(ts, ds, ss);
 
        u.u_smap = u.u_csmap;
        vgetvm(ts, ds, ss);
 

-       if (pagi == 0) {
-               /*
-                * Read in data segment.
-                */
-               u.u_base = (char *)ctob(ts);
-               u.u_offset = sizeof(u.u_exdata)+u.u_exdata.ux_tsize;
-               u.u_count = u.u_exdata.ux_dsize;
-               readi(ip);
-       }
+       if (pagi == 0)
+               u.u_error =
+                   rdwri(UIO_READ, ip,
+                       (char*)ctob(ts), (int)u.u_exdata.ux_dsize,
+                       (int)(sizeof(u.u_exdata)+u.u_exdata.ux_tsize),
+                       0, (int *)0);

        xalloc(ip, pagi);
        if (pagi && u.u_procp->p_textp)
                vinifod((struct fpte *)dptopte(u.u_procp, 0),
        xalloc(ip, pagi);
        if (pagi && u.u_procp->p_textp)
                vinifod((struct fpte *)dptopte(u.u_procp, 0),


@@ -370,6 +368,8 @@ register struct inode *ip;
        /* THIS SHOULD BE DONE AT A LOWER LEVEL, IF AT ALL */
        mtpr(TBIA, 0);
 
        /* THIS SHOULD BE DONE AT A LOWER LEVEL, IF AT ALL */
        mtpr(TBIA, 0);
 

+       if (u.u_error)
+               swkill(u.u_procp, "i/o error mapping pages");

        /*
         * set SUID/SGID protections, if no tracing
         */
        /*
         * set SUID/SGID protections, if no tracing
         */


@@ -430,9 +430,9 @@ 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], 1);
+                       closef(u.u_ofile[i], 1, u.u_pofile[i]);

                        u.u_ofile[i] = NULL;
                        u.u_ofile[i] = NULL;

-                       u.u_pofile[i] &= ~EXCLOSE;
+                       u.u_pofile[i] = 0;

                }
        }
 
                }
        }
 


@@ -441,7 +441,7 @@ setregs()
         */
        u.u_acflag &= ~AFORK;
        bcopy((caddr_t)u.u_dent.d_name, (caddr_t)u.u_comm,
         */
        u.u_acflag &= ~AFORK;
        bcopy((caddr_t)u.u_dent.d_name, (caddr_t)u.u_comm,

-           u.u_dent.d_namlen + 1);
+           (unsigned)(u.u_dent.d_namlen + 1));

 }
 
 /*
 }
 
 /*


@@ -468,7 +468,6 @@ exit(rv)
 {
        register int i;
        register struct proc *p, *q;
 {
        register int i;
        register struct proc *p, *q;

-       register struct file *f;

        register int x;
 
 #ifdef PGINPROF
        register int x;
 
 #ifdef PGINPROF


@@ -506,10 +505,17 @@ exit(rv)
                        sleep((caddr_t)p, PZERO - 1);
                p->p_flag &= ~SVFDONE;
        }
                        sleep((caddr_t)p, PZERO - 1);
                p->p_flag &= ~SVFDONE;
        }

-       for (i=0; i<NOFILE; i++) {
+       for (i = 0; i < NOFILE; i++) {
+#ifdef notdef
+               /* why was this like this? */

                f = u.u_ofile[i];
                u.u_ofile[i] = NULL;
                closef(f, 1);
                f = u.u_ofile[i];
                u.u_ofile[i] = NULL;
                closef(f, 1);

+#else
+               closef(u.u_ofile[i], 1, u.u_pofile[i]);
+               u.u_ofile[i] = NULL;
+               u.u_pofile[i] = 0;
+#endif

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


@@ -758,35 +764,61 @@ 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
-        */
+       for (; p != u.u_procp; p = p->p_pptr)
+               if (p->p_ppid == 0)
+                       return (0);
+       return (1);
+}

 
 

-       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);
+struct proc *
+pfind(pid)
+       int pid;
+{
+       register struct proc *p;
+
+       for (p = &proc[pidhash[PIDHASH(pid)]]; p != &proc[0]; p = &proc[p->p_idhash])
+               if (p->p_pid == pid)
+                       return (p);
+       return ((struct proc *)0);

 }
 }