sleep doesn't need spl0 (idle does it)

[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 f2e505c..41480e0 100644 (file)
--- a/usr/src/sys/kern/kern_proc.c
+++ b/usr/src/sys/kern/kern_proc.c
@@ -1,698 +1,293 @@
-/*     kern_proc.c     3.18    %G%     */
+/*
+ * Copyright (c) 1982, 1986, 1989, 1991 Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ *
+ *     @(#)kern_proc.c 7.15 (Berkeley) %G%
+ */

 
 

-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/map.h"
-#include "../h/mtpr.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/buf.h"
-#include "../h/reg.h"
-#include "../h/inode.h"
-#include "../h/seg.h"
-#include "../h/acct.h"
-#include "/usr/include/wait.h"
-#include "../h/pte.h"
-#include "../h/vm.h"
-#include "../h/text.h"
-#include "../h/psl.h"
-#include "../h/limit.h"
+#include "param.h"
+#include "systm.h"
+#include "map.h"
+#include "kernel.h"
+#include "proc.h"
+#include "buf.h"
+#include "seg.h"
+#include "acct.h"
+#include "wait.h"
+#include "file.h"
+#include "../ufs/quota.h"
+#include "uio.h"
+#include "malloc.h"
+#include "mbuf.h"
+#include "ioctl.h"
+#include "tty.h"

 
 /*
 
 /*

- * exec system call, with and without environments.
+ * Is p an inferior of the current process?

  */
  */

-struct execa {
-       char    *fname;
-       char    **argp;
-       char    **envp;
-};
-
-exec()
+inferior(p)
+       register struct proc *p;

 {
 {

-       ((struct execa *)u.u_ap)->envp = NULL;
-       exece();
+
+       for (; p != curproc; p = p->p_pptr)
+               if (p->p_pid == 0)
+                       return (0);
+       return (1);

 }
 
 }
 

-exece()
+/*
+ * Locate a process by number
+ */
+struct proc *
+pfind(pid)
+       register pid;

 {
 {

-       register nc;
-       register char *cp;
-       register struct buf *bp;
-       register struct execa *uap;
-       int na, ne, ucp, ap, c;
-       struct inode *ip;
-       swblk_t bno;
+       register struct proc *p = pidhash[PIDHASH(pid)];

 
 

-       if ((ip = namei(uchar, 0)) == NULL)
-               return;
-       bno = 0;
-       bp = 0;
-       if(access(ip, IEXEC))
-               goto bad;
-       if((ip->i_mode & IFMT) != IFREG ||
-          (ip->i_mode & (IEXEC|(IEXEC>>3)|(IEXEC>>6))) == 0) {
-               u.u_error = EACCES;
-               goto bad;
-       }
-       /*
-        * Collect arguments on "file" in swap space.
-        */
-       na = 0;
-       ne = 0;
-       nc = 0;
-       uap = (struct execa *)u.u_ap;
-       if ((bno = malloc(argmap, ctod(clrnd((int) btoc(NCARGS))))) == 0) {
-               swkill(u.u_procp, "exece");
-               goto bad;
-       }
-       if (bno % CLSIZE)
-               panic("execa malloc");
-       if (uap->argp) for (;;) {
-               ap = NULL;
-               if (uap->argp) {
-                       ap = fuword((caddr_t)uap->argp);
-                       uap->argp++;
-               }
-               if (ap==NULL && uap->envp) {
-                       uap->argp = NULL;
-                       if ((ap = fuword((caddr_t)uap->envp)) == NULL)
-                               break;
-                       uap->envp++;
-                       ne++;
-               }
-               if (ap==NULL)
-                       break;
-               na++;
-               if(ap == -1)
-                       u.u_error = EFAULT;
-               do {
-                       if (nc >= NCARGS-1)
-                               u.u_error = E2BIG;
-                       if ((c = fubyte((caddr_t)ap++)) < 0)
-                               u.u_error = EFAULT;
-                       if (u.u_error) {
-                               if (bp)
-                                       brelse(bp);
-                               bp = 0;
-                               goto badarg;
-                       }
-                       if ((nc&BMASK) == 0) {
-                               if (bp)
-                                       bdwrite(bp);
-                               bp = getblk(argdev,
-                                   (daddr_t)(dbtofsb(bno)+(nc>>BSHIFT)));
-                               cp = bp->b_un.b_addr;
-                       }
-                       nc++;
-                       *cp++ = c;
-               } while (c>0);
-       }
-       if (bp)
-               bdwrite(bp);
-       bp = 0;
-       nc = (nc + NBPW-1) & ~(NBPW-1);
-       if (getxfile(ip, nc) || u.u_error) {
-badarg:
-               for (c = 0; c < nc; c += BSIZE)
-                       if (bp = baddr(argdev, dbtofsb(bno)+(c>>BSHIFT))) {
-                               bp->b_flags |= B_AGE;           /* throw away */
-                               bp->b_flags &= ~B_DELWRI;       /* cancel io */
-                               brelse(bp);
-                               bp = 0;
-                       }
-               goto bad;
-       }
-
-       /*
-        * copy back arglist
-        */
-
-       ucp = USRSTACK - nc - NBPW;
-       ap = ucp - na*NBPW - 3*NBPW;
-       u.u_ar0[SP] = ap;
-       (void) suword((caddr_t)ap, na-ne);
-       nc = 0;
-       for (;;) {
-               ap += NBPW;
-               if (na==ne) {
-                       (void) suword((caddr_t)ap, 0);
-                       ap += NBPW;
-               }
-               if (--na < 0)
-                       break;
-               (void) suword((caddr_t)ap, ucp);
-               do {
-                       if ((nc&BMASK) == 0) {
-                               if (bp)
-                                       brelse(bp);
-                               bp = bread(argdev,
-                                   (daddr_t)(dbtofsb(bno)+(nc>>BSHIFT)));
-                               bp->b_flags |= B_AGE;           /* throw away */
-                               bp->b_flags &= ~B_DELWRI;       /* cancel io */
-                               cp = bp->b_un.b_addr;
-                       }
-                       (void) subyte((caddr_t)ucp++, (c = *cp++));
-                       nc++;
-               } while(c&0377);
-       }
-       (void) suword((caddr_t)ap, 0);
-       (void) suword((caddr_t)ucp, 0);
-       setregs();
-bad:
-       if (bp)
-               brelse(bp);
-       if (bno)
-               mfree(argmap, ctod(clrnd((int) btoc(NCARGS))), bno);
-       iput(ip);
+       for (; p; p = p->p_hash)
+               if (p->p_pid == pid)
+                       return (p);
+       return ((struct proc *)0);

 }
 
 /*
 }
 
 /*

- * Read in and set up memory for executed file.
- * Zero return is normal;
- * non-zero means only the text is being replaced
+ * Locate a process group by number

  */
  */

-getxfile(ip, nargc)
-register struct inode *ip;
+struct pgrp *
+pgfind(pgid)
+       register pid_t pgid;

 {
 {

-       register sep;
-       register size_t ts, ds, ss;
-       register int overlay;
-       int pagi = 0;
-
-       /*
-        * read in first few bytes
-        * of file for segment
-        * sizes:
-        * ux_mag = 407/410/411/405
-        *  407 is plain executable
-        *  410 is RO text
-        *  411 is separated ID
-        *  405 is overlaid text
-        *  412 is demand paged plain executable (NOT IMPLEMENTED)
-        *  413 is demand paged RO text
-        */
-
-       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;
-       if(u.u_error)
-               goto bad;
-       if (u.u_count!=0) {
-               u.u_error = ENOEXEC;
-               goto bad;
-       }
-       sep = 0;
-       overlay = 0;
-       switch (u.u_exdata.ux_mag) {
-
-       case 0405:
-               overlay++;
-               break;
-
-       case 0412:
-               u.u_error = ENOEXEC;
-               goto bad;
-
-       case 0407:
-               u.u_exdata.ux_dsize += u.u_exdata.ux_tsize;
-               u.u_exdata.ux_tsize = 0;
-               break;
-
-       case 0413:
-               pagi = SPAGI;
-               /* fall into ... */
-
-       case 0410:
-               if (u.u_exdata.ux_tsize == 0) {
-                       u.u_error = ENOEXEC;
-                       goto bad;
-               }
-               break;
+       register struct pgrp *pgrp = pgrphash[PIDHASH(pgid)];

 
 

-       case 0411:
-               u.u_error = ENOEXEC;
-               goto bad;
-
-       default:
-               u.u_error = ENOEXEC;
-               goto bad;
-       }
-       if(u.u_exdata.ux_tsize!=0 && (ip->i_flag&ITEXT)==0 && ip->i_count!=1) {
-               u.u_error = ETXTBSY;
-               goto bad;
-       }
-
-       /*
-        * find text and data sizes
-        * try them out for possible
-        * exceed of max sizes
-        */
-
-       ts = clrnd(btoc(u.u_exdata.ux_tsize));
-       ds = clrnd(btoc((u.u_exdata.ux_dsize+u.u_exdata.ux_bsize)));
-       ss = clrnd(SSIZE + btoc(nargc));
-       if (overlay) {
-               if ((u.u_procp->p_flag & SPAGI) ||
-                   u.u_sep==0 && ctos(ts) != ctos(u.u_tsize) || nargc) {
-                       u.u_error = ENOMEM;
-                       goto bad;
-               }
-               ds = u.u_dsize;
-               ss = u.u_ssize;
-               sep = u.u_sep;
-               xfree();
-               xalloc(ip, pagi);
-               u.u_ar0[PC] = u.u_exdata.ux_entloc + 2; /* skip over entry mask */
-       } else {
-               if (chksize(ts, ds, ss))
-                       goto bad;
-               u.u_cdmap = zdmap;
-               u.u_csmap = zdmap;
-               if (swpexpand(ds, ss, &u.u_cdmap, &u.u_csmap) == NULL)
-                       goto bad;
+       for (; pgrp; pgrp = pgrp->pg_hforw)
+               if (pgrp->pg_id == pgid)
+                       return (pgrp);
+       return ((struct pgrp *)0);
+}

 
 

+/*
+ * Move p to a new or existing process group (and session)
+ */
+enterpgrp(p, pgid, mksess)
+       register struct proc *p;
+       pid_t pgid;
+{
+       register struct pgrp *pgrp = pgfind(pgid);
+       register struct proc **pp;
+       register struct proc *cp;
+       int n;
+
+#ifdef DIAGNOSTIC
+       if (pgrp && mksess)     /* firewalls */
+               panic("enterpgrp: setsid into non-empty pgrp");
+       if (SESS_LEADER(p))
+               panic("enterpgrp: session leader attempted setpgrp");
+#endif
+       if (pgrp == NULL) {

                /*
                /*

-                * At this point, committed to the new image!
-                * Release virtual memory resources of old process, and
-                * initialize the virtual memory of the new process.
-                * If we resulted from vfork(), instead wakeup our
-                * parent who will set SVFDONE when he has taken back
-                * our resources.
+                * new process group

                 */
                 */

-               u.u_prof.pr_scale = 0;
-               if ((u.u_procp->p_flag & SVFORK) == 0)
-                       vrelvm();
-               else {
-                       u.u_procp->p_flag &= ~SVFORK;
-                       u.u_procp->p_flag |= SKEEP;
-                       wakeup((caddr_t)u.u_procp);
-                       while ((u.u_procp->p_flag & SVFDONE) == 0)
-                               sleep((caddr_t)u.u_procp, PZERO - 1);
-                       u.u_procp->p_flag &= ~(SVFDONE|SKEEP);
-               }
-               u.u_procp->p_flag &= ~(SPAGI|SANOM|SUANOM);
-               u.u_procp->p_flag |= pagi;
-               u.u_dmap = u.u_cdmap;
-               u.u_smap = u.u_csmap;
-               vgetvm(ts, ds, ss);
-
-               if (pagi == 0) {
+#ifdef DIAGNOSTIC
+               if (p->p_pid != pgid)
+                       panic("enterpgrp: new pgrp and pid != pgid");
+#endif
+               MALLOC(pgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP,
+                      M_WAITOK);
+               if (mksess) {
+                       register struct session *sess;

                        /*
                        /*

-                        * Read in data segment.
+                        * new session

                         */
                         */

-                       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);
+                       MALLOC(sess, struct session *, sizeof(struct session),
+                               M_SESSION, M_WAITOK);
+                       sess->s_leader = p;
+                       sess->s_count = 1;
+                       sess->s_ttyvp = NULL;
+                       sess->s_ttyp = NULL;
+                       p->p_flag &= ~SCTTY;
+                       pgrp->pg_session = sess;
+#ifdef DIAGNOSTIC
+                       if (p != curproc)
+                               panic("enterpgrp: mksession and p != curproc");
+#endif
+               } else {
+                       pgrp->pg_session = p->p_session;
+                       pgrp->pg_session->s_count++;

                }
                }

-               xalloc(ip, pagi);
-               if (pagi && u.u_procp->p_textp)
-                       vinifod((struct fpte *)dptopte(u.u_procp, 0),
-                           PG_FTEXT, u.u_procp->p_textp->x_iptr,
-                           1 + ts/CLSIZE, (int)btoc(u.u_exdata.ux_dsize));
+               pgrp->pg_id = pgid;
+               pgrp->pg_hforw = pgrphash[n = PIDHASH(pgid)];
+               pgrphash[n] = pgrp;
+               pgrp->pg_jobc = 0;
+               pgrp->pg_mem = NULL;
+       } else if (pgrp == p->p_pgrp)
+               return;

 
 

-               /* THIS SHOULD BE DONE AT A LOWER LEVEL, IF AT ALL */
-               mtpr(TBIA, 0);
+       /*
+        * Adjust eligibility of affected pgrps to participate in job control.
+        * Increment eligibility counts before decrementing, otherwise we
+        * could reach 0 spuriously during the first call.
+        */
+       fixjobc(p, pgrp, 1);
+       fixjobc(p, p->p_pgrp, 0);

 
 

-               /*
-                * set SUID/SGID protections, if no tracing
-                */
-               if ((u.u_procp->p_flag&STRC)==0) {
-                       if(ip->i_mode&ISUID)
-                               if(u.u_uid != 0) {
-                                       u.u_uid = ip->i_uid;
-                                       u.u_procp->p_uid = ip->i_uid;
-                               }
-                       if(ip->i_mode&ISGID)
-                               u.u_gid = ip->i_gid;
-               } else
-                       psignal(u.u_procp, SIGTRAP);
-       }
-       u.u_tsize = ts;
-       u.u_dsize = ds;
-       u.u_ssize = ss;
-       u.u_sep = sep;
-bad:
-       return(overlay);
+       /*
+        * unlink p from old process group
+        */
+       for (pp = &p->p_pgrp->pg_mem; *pp; pp = &(*pp)->p_pgrpnxt)
+               if (*pp == p) {
+                       *pp = p->p_pgrpnxt;
+                       goto done;
+               }
+       panic("enterpgrp: can't find p on old pgrp");
+done:
+       /*
+        * delete old if empty
+        */
+       if (p->p_pgrp->pg_mem == 0)
+               pgdelete(p->p_pgrp);
+       /*
+        * link into new one
+        */
+       p->p_pgrp = pgrp;
+       p->p_pgrpnxt = pgrp->pg_mem;
+       pgrp->pg_mem = p;

 }
 
 /*
 }
 
 /*

- * Clear registers on exec
+ * remove process from process group

  */
  */

-setregs()
+leavepgrp(p)
+       register struct proc *p;

 {
 {

-       register int (**rp)();
-       register i;
-       long sigmask;
-
-       for(rp = &u.u_signal[0], sigmask = 1L; rp < &u.u_signal[NSIG];
-           sigmask <<= 1, rp++) {
-               switch (*rp) {
+       register struct proc **pp = &p->p_pgrp->pg_mem;

 
 

-               case SIG_IGN:
-               case SIG_DFL:
-               case SIG_HOLD:
-                       continue;
-
-               default:
-                       /*
-                        * Normal or deferring catch; revert to default.
-                        */
-                       (void) spl6();
-                       *rp = SIG_DFL;
-                       if ((int)*rp & 1)
-                               u.u_procp->p_siga0 |= sigmask;
-                       else
-                               u.u_procp->p_siga1 &= ~sigmask;
-                       if ((int)*rp & 2)
-                               u.u_procp->p_siga1 |= sigmask;
-                       else
-                               u.u_procp->p_siga1 &= ~sigmask;
-                       (void) spl0();
-                       continue;
+       for (; *pp; pp = &(*pp)->p_pgrpnxt)
+               if (*pp == p) {
+                       *pp = p->p_pgrpnxt;
+                       goto done;

                }
                }

-       }
-/*
-       for(rp = &u.u_ar0[0]; rp < &u.u_ar0[16];)
-               *rp++ = 0;
-*/
-       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]);
-                       u.u_ofile[i] = NULL;
-                       u.u_pofile[i] &= ~EXCLOSE;
-               }
-       }
-       /*
-        * Remember file name for accounting.
-        */
-       u.u_acflag &= ~AFORK;
-       bcopy((caddr_t)u.u_dbuf, (caddr_t)u.u_comm, DIRSIZ);
+       panic("leavepgrp: can't find p in pgrp");
+done:
+       if (!p->p_pgrp->pg_mem)
+               pgdelete(p->p_pgrp);
+       p->p_pgrp = 0;

 }
 
 /*
 }
 
 /*

- * exit system call:
- * pass back caller's arg
+ * delete a process group

  */
  */

-rexit()
+pgdelete(pgrp)
+       register struct pgrp *pgrp;

 {
 {

-       register struct a {
-               int     rval;
-       } *uap;
-
-       uap = (struct a *)u.u_ap;
-       exit((uap->rval & 0377) << 8);
+       register struct pgrp **pgp = &pgrphash[PIDHASH(pgrp->pg_id)];
+
+       if (pgrp->pg_session->s_ttyp != NULL && 
+           pgrp->pg_session->s_ttyp->t_pgrp == pgrp)
+               pgrp->pg_session->s_ttyp->t_pgrp = NULL;
+       for (; *pgp; pgp = &(*pgp)->pg_hforw)
+               if (*pgp == pgrp) {
+                       *pgp = pgrp->pg_hforw;
+                       goto done;
+               }
+       panic("pgdelete: can't find pgrp on hash chain");
+done:
+       if (--pgrp->pg_session->s_count == 0)
+               FREE(pgrp->pg_session, M_SESSION);
+       FREE(pgrp, M_PGRP);

 }
 
 }
 

+static orphanpg();
+

 /*
 /*

- * Release resources.
- * Save u. area for parent to look at.
- * Enter zombie state.
- * Wake up parent and init processes,
- * and dispose of children.
+ * Adjust pgrp jobc counters when specified process changes process group.
+ * We count the number of processes in each process group that "qualify"
+ * the group for terminal job control (those with a parent in a different
+ * process group of the same session).  If that count reaches zero, the
+ * process group becomes orphaned.  Check both the specified process'
+ * process group and that of its children.
+ * entering == 0 => p is leaving specified group.
+ * entering == 1 => p is entering specified group.

  */
  */

-exit(rv)
+fixjobc(p, pgrp, entering)
+       register struct proc *p;
+       register struct pgrp *pgrp;
+       int entering;

 {
 {

-       register int i;
-       register struct proc *p, *q;
-       register struct file *f;
-       register int x;
+       register struct pgrp *hispgrp;
+       register struct session *mysession = pgrp->pg_session;

 
 

-#ifdef PGINPROF
-       vmsizmon();
-#endif
-       p = u.u_procp;
-       p->p_flag &= ~(STRC|SULOCK);
-       p->p_flag |= SWEXIT;
-       p->p_clktim = 0;
-       (void) spl6();
-       if ((int)SIG_IGN & 1)
-               p->p_siga0 = ~0;
-       else
-               p->p_siga0 = 0;
-       if ((int)SIG_IGN & 2)
-               p->p_siga1 = ~0;
-       else
-               p->p_siga1 = 0;
-       (void) spl0();
-       p->p_aveflt = 0;
-       for(i=0; i<NSIG; i++)
-               u.u_signal[i] = SIG_IGN;

        /*
        /*

-        * Release virtual memory.  If we resulted from
-        * a vfork(), instead give the resources back to
-        * the parent.
+        * Check p's parent to see whether p qualifies its own process
+        * group; if so, adjust count for p's process group.

         */
         */

-       if ((p->p_flag & SVFORK) == 0)
-               vrelvm();
-       else {
-               p->p_flag &= ~SVFORK;
-               wakeup((caddr_t)p);
-               while ((p->p_flag & SVFDONE) == 0)
-                       sleep((caddr_t)p, PZERO - 1);
-               p->p_flag &= ~SVFDONE;
-       }
-       for(i=0; i<NOFILE; i++) {
-               f = u.u_ofile[i];
-               u.u_ofile[i] = NULL;
-               closef(f);
-       }
-       plock(u.u_cdir);
-       iput(u.u_cdir);
-       if (u.u_rdir) {
-               plock(u.u_rdir);
-               iput(u.u_rdir);
-       }
-       u.u_limit[LIM_FSIZE] = INFINITY;
-       acct();
-       vrelpt(u.u_procp);
-       vrelu(u.u_procp, 0);
-       multprog--;
-/*     spl7();                 /* clock will get mad because of overlaying */
-       noproc = 1;
-       p->p_stat = SZOMB;
-       i = PIDHASH(p->p_pid);
-       x = p - proc;
-       if (pidhash[i] == x)
-               pidhash[i] = p->p_idhash;
-       else {
-               for (i = pidhash[i]; i != 0; i = proc[i].p_idhash)
-                       if (proc[i].p_idhash == x) {
-                               proc[i].p_idhash = p->p_idhash;
-                               goto done;
-                       }
-               panic("exit");
-       }
-done:
-       ((struct xproc *)p)->xp_xstat = rv;             /* overlay */
-       ((struct xproc *)p)->xp_vm = u.u_vm;            /* overlay */
-       vmsadd(&((struct xproc *)p)->xp_vm, &u.u_cvm);
-       for(q = &proc[0]; q < &proc[NPROC]; q++)
-               if(q->p_pptr == p) {
-                       q->p_pptr = &proc[1];
-                       q->p_ppid = 1;
-                       wakeup((caddr_t)&proc[1]);
-                       /*
-                        * Traced processes are killed
-                        * since their existence means someone is screwing up.
-                        * Stopped processes are sent a hangup and a continue.
-                        * This is designed to be ``safe'' for setuid
-                        * processes since they must be willing to tolerate
-                        * hangups anyways.
-                        */
-                       if (q->p_flag&STRC) {
-                               q->p_flag &= ~STRC;
-                               psignal(q, SIGKILL);
-                       } else if (q->p_stat == SSTOP) {
-                               psignal(q, SIGHUP);
-                               psignal(q, SIGCONT);
-                       }
-                       /*
-                        * Protect this process from future
-                        * tty signals, clear TSTP/TTIN/TTOU if pending,
-                        * and set SDETACH bit on procs.
-                        */
-                       spgrp(q, -1);
-               }
-       wakeup((caddr_t)p->p_pptr);
-       psignal(p->p_pptr, SIGCHLD);
-       swtch();
-}
-
-wait()
-{
-       struct vtimes vm;
-       struct vtimes *vp;
+       if ((hispgrp = p->p_pptr->p_pgrp) != pgrp &&
+           hispgrp->pg_session == mysession)
+               if (entering)
+                       pgrp->pg_jobc++;
+               else if (--pgrp->pg_jobc == 0)
+                       orphanpg(pgrp);

 
 

-       if ((u.u_ar0[PS] & PSL_ALLCC) != PSL_ALLCC) {
-               wait1(0, (struct vtimes *)0);
-               return;
-       }
-       vp = (struct vtimes *)u.u_ar0[R1];
-       wait1(u.u_ar0[R0], &vm);
-       if (u.u_error)
-               return;
-       (void) copyout((caddr_t)&vm, (caddr_t)vp, sizeof (struct vtimes));
+       /*
+        * Check this process' children to see whether they qualify
+        * their process groups; if so, adjust counts for children's
+        * process groups.
+        */
+       for (p = p->p_cptr; p; p = p->p_osptr)
+               if ((hispgrp = p->p_pgrp) != pgrp &&
+                   hispgrp->pg_session == mysession &&
+                   p->p_stat != SZOMB)
+                       if (entering)
+                               hispgrp->pg_jobc++;
+                       else if (--hispgrp->pg_jobc == 0)
+                               orphanpg(hispgrp);

 }
 
 }
 

-/*
- * Wait system call.
- * Search for a terminated (zombie) child,
- * finally lay it to rest, and collect its status.
- * Look also for stopped (traced) children,
- * and pass back status from them.
+/* 
+ * A process group has become orphaned;
+ * if there are any stopped processes in the group,
+ * hang-up all process in that group.

  */
  */

-wait1(options, vp)
-       register options;
-       struct vtimes *vp;
+static
+orphanpg(pg)
+       struct pgrp *pg;

 {
 {

-       register f;

        register struct proc *p;
 
        register struct proc *p;
 

-       f = 0;
-loop:
-       for(p = &proc[0]; p < &proc[NPROC]; p++)
-       if(p->p_pptr == u.u_procp) {
-               f++;
-               if(p->p_stat == SZOMB) {
-                       u.u_r.r_val1 = p->p_pid;
-                       u.u_r.r_val2 = ((struct xproc *)p)->xp_xstat;
-                       ((struct xproc *)p)->xp_xstat = 0;
-                       if (vp)
-                               *vp = ((struct xproc *)p)->xp_vm;
-                       vmsadd(&u.u_cvm, &((struct xproc *)p)->xp_vm);
-                       ((struct xproc *)p)->xp_vm = zvms;
-                       p->p_stat = NULL;
-                       p->p_pid = 0;
-                       p->p_ppid = 0;
-                       p->p_pptr = 0;
-                       p->p_sig = 0;
-                       p->p_siga0 = 0;
-                       p->p_siga1 = 0;
-                       p->p_pgrp = 0;
-                       p->p_flag = 0;
-                       p->p_wchan = 0;
-                       p->p_cursig = 0;
-                       return;
-               }
-               if (p->p_stat == SSTOP && (p->p_flag&SWTED)==0 &&
-                   (p->p_flag&STRC || options&WUNTRACED)) {
-                       p->p_flag |= SWTED;
-                       u.u_r.r_val1 = p->p_pid;
-                       u.u_r.r_val2 = (p->p_cursig<<8) | WSTOPPED;
+       for (p = pg->pg_mem; p; p = p->p_pgrpnxt) {
+               if (p->p_stat == SSTOP) {
+                       for (p = pg->pg_mem; p; p = p->p_pgrpnxt) {
+                               psignal(p, SIGHUP);
+                               psignal(p, SIGCONT);
+                       }

                        return;
                }
        }
                        return;
                }
        }

-       if (f==0) {
-               u.u_error = ECHILD;
-               return;
-       }
-       if (options&WNOHANG) {
-               u.u_r.r_val1 = 0;
-               return;
-       }
-/*
-       if (setjmp(u.u_qsav)) {
-               u.u_eosys = RESTARTSYS;
-               return;
-       }
-*/
-       sleep((caddr_t)u.u_procp, PWAIT);
-       goto loop;

 }
 
 }
 

-/*
- * fork system call.
- */
-fork()
+#ifdef debug
+/* DEBUG */
+pgrpdump()

 {
 {

+       register struct pgrp *pgrp;
+       register struct proc *p;
+       register i;

 
 

-       u.u_cdmap = zdmap;
-       u.u_csmap = zdmap;
-       if (swpexpand(u.u_dsize, u.u_ssize, &u.u_cdmap, &u.u_csmap) == 0) {
-               u.u_r.r_val2 = 0;
-               return;
-       }
-       fork1(0);
-}
-
-fork1(isvfork)
-{
-       register struct proc *p1, *p2;
-       register a;
+       for (i=0; i<PIDHSZ; i++) {
+               if (pgrphash[i]) {
+                 printf("\tindx %d\n", i);
+                 for (pgrp=pgrphash[i]; pgrp; pgrp=pgrp->pg_hforw) {
+                   printf("\tpgrp %x, pgid %d, sess %x, sesscnt %d, mem %x\n",
+                       pgrp, pgrp->pg_id, pgrp->pg_session,
+                       pgrp->pg_session->s_count, pgrp->pg_mem);
+                   for (p=pgrp->pg_mem; p; p=p->p_pgrpnxt) {
+                       printf("\t\tpid %d addr %x pgrp %x\n", 
+                               p->p_pid, p, p->p_pgrp);
+                   }
+                 }

 
 

-       a = 0;
-       p2 = NULL;
-       for(p1 = &proc[0]; p1 < &proc[NPROC]; p1++) {
-               if (p1->p_stat==NULL && p2==NULL)
-                       p2 = p1;
-               else {
-                       if (p1->p_uid==u.u_uid && p1->p_stat!=NULL)
-                               a++;

                }
        }
                }
        }

-       /*
-        * Disallow if
-        *  No processes at all;
-        *  not su and too many procs owned; or
-        *  not su and would take last slot.
-        */
-       if (p2==NULL || (u.u_uid!=0 && (p2==&proc[NPROC-1] || a>MAXUPRC))) {
-               u.u_error = EAGAIN;
-               if (!isvfork) {
-                       (void) vsexpand(0, &u.u_cdmap, 1);
-                       (void) vsexpand(0, &u.u_csmap, 1);
-               }
-               goto out;
-       }
-       p1 = u.u_procp;
-       if(newproc(isvfork)) {
-               u.u_r.r_val1 = p1->p_pid;
-               u.u_r.r_val2 = 1;  /* child */
-               u.u_start = time;
-               u.u_acflag = AFORK;
-               return;
-       }
-       u.u_r.r_val1 = p2->p_pid;
-
-out:
-       u.u_r.r_val2 = 0;
-}
-
-/*
- * break system call.
- *  -- bad planning: "break" is a dirty word in C.
- */
-sbreak()
-{
-       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);

 }
 }

+#endif /* debug */