merge in vnode changes

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

diff --git a/usr/src/sys/kern/kern_exit.c b/usr/src/sys/kern/kern_exit.c
index de37b5a..ec7ce79 100644 (file)
--- a/usr/src/sys/kern/kern_exit.c
+++ b/usr/src/sys/kern/kern_exit.c
@@ -1,7 +1,10 @@
-/*     kern_exit.c     6.8     85/05/22        */
-
-#include "../machine/reg.h"
-#include "../machine/psl.h"
+/*
+ * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)kern_exit.c 7.6 (Berkeley) %G%
+ */

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


@@ -14,9 +17,15 @@
 #include "wait.h"
 #include "vm.h"
 #include "file.h"
 #include "wait.h"
 #include "vm.h"
 #include "file.h"

-#include "mbuf.h"

 #include "inode.h"
 #include "inode.h"

+#include "tty.h"

 #include "syslog.h"
 #include "syslog.h"

+#include "malloc.h"
+
+#include "machine/reg.h"
+#ifdef COMPAT_43
+#include "machine/psl.h"
+#endif

 
 /*
  * Exit system call: pass back caller's arg
 
 /*
  * Exit system call: pass back caller's arg


@@ -26,9 +35,12 @@ rexit()
        register struct a {
                int     rval;
        } *uap;
        register struct a {
                int     rval;
        } *uap;

+       union wait status;

 
        uap = (struct a *)u.u_ap;
 
        uap = (struct a *)u.u_ap;

-       exit((uap->rval & 0377) << 8);
+       status.w_status = 0;
+       status.w_retcode = uap->rval;
+       exit(status.w_status);

 }
 
 /*
 }
 
 /*


@@ -39,17 +51,18 @@ rexit()
  * and dispose of children.
  */
 exit(rv)
  * and dispose of children.
  */
 exit(rv)

-       int rv;
+       int rv;                 /* should be union wait (XXX) */

 {
        register int i;
        register struct proc *p, *q, *nq;
        register int x;
 {
        register int i;
        register struct proc *p, *q, *nq;
        register int x;

-       struct mbuf *m = m_getclr(M_WAIT, MT_ZOMBIE);

 
 #ifdef PGINPROF
        vmsizmon();
 #endif
        p = u.u_procp;
 
 #ifdef PGINPROF
        vmsizmon();
 #endif
        p = u.u_procp;

+       MALLOC(p->p_ru, struct rusage *, sizeof(struct rusage),
+               M_ZOMBIE, M_WAITOK);

        p->p_flag &= ~(STRC|SULOCK);
        p->p_flag |= SWEXIT;
        p->p_sigignore = ~0;
        p->p_flag &= ~(STRC|SULOCK);
        p->p_flag |= SWEXIT;
        p->p_sigignore = ~0;


@@ -72,13 +85,23 @@ 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 <= u.u_lastfile; i++) {

                struct file *f;
 
                f = u.u_ofile[i];
                struct file *f;
 
                f = u.u_ofile[i];

-               u.u_ofile[i] = NULL;
-               u.u_pofile[i] = 0;
-               closef(f);
+               if (f) {
+                       u.u_ofile[i] = NULL;
+                       u.u_pofile[i] = 0;
+                       closef(f);
+               }
+       }
+       if (SESS_LEADER(p)) {
+               p->p_session->s_leader = 0;
+               /* TODO: vhangup(); */
+               if (u.u_ttyp) {
+                       u.u_ttyp->t_session = 0;
+                       u.u_ttyp->t_pgid = 0;
+               }

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


@@ -91,9 +114,22 @@ exit(rv)
 #ifdef QUOTA
        qclean();
 #endif
 #ifdef QUOTA
        qclean();
 #endif

-       vrelpt(u.u_procp);
+#ifdef KTRACE
+       /* 
+        * release trace file
+        */
+       if (p->p_tracep)
+               irele(p->p_tracep);
+#endif
+       /*
+       /*
+        * Freeing the user structure and kernel stack
+        * for the current process: have to run a bit longer
+        * using the pages which are about to be freed...
+        * vrelu will block memory allocation by raising ipl.
+        */

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

-       (void) spl5();          /* hack for mem alloc race XXX */
+       vrelpt(u.u_procp);

        if (*p->p_prev = p->p_nxt)              /* off allproc queue */
                p->p_nxt->p_prev = p->p_prev;
        if (p->p_nxt = zombproc)                /* onto zombproc */
        if (*p->p_prev = p->p_nxt)              /* off allproc queue */
                p->p_nxt->p_prev = p->p_prev;
        if (p->p_nxt = zombproc)                /* onto zombproc */


@@ -115,19 +151,25 @@ exit(rv)
                        }
                panic("exit");
        }
                        }
                panic("exit");
        }

-       if (p->p_pid == 1)
-               panic("init died");
+       if (p->p_pid == 1) {
+               if (p->p_dsize == 0) {
+                       printf("Can't exec init (errno %d)\n", rv >> 8);
+                       for (;;)
+                               ;
+               } else
+                       panic("init died");
+       }

 done:
        p->p_xstat = rv;
 done:
        p->p_xstat = rv;

-       if (m) {
-               p->p_ru = mtod(m, struct rusage *);
-               *p->p_ru = u.u_ru;
-               ruadd(p->p_ru, &u.u_cru);
-       } else
-               log(KERN_ALERT, "exit: pid %d: no mbuf", p->p_pid);
+       *p->p_ru = u.u_ru;
+       ruadd(p->p_ru, &u.u_cru);

        if (p->p_cptr)          /* only need this if any child is S_ZOMB */
                wakeup((caddr_t)&proc[1]);
        if (p->p_cptr)          /* only need this if any child is S_ZOMB */
                wakeup((caddr_t)&proc[1]);

+       if (PGRP_JOBC(p))
+               p->p_pgrp->pg_jobc--;

        for (q = p->p_cptr; q != NULL; q = nq) {
        for (q = p->p_cptr; q != NULL; q = nq) {

+               if (PGRP_JOBC(q))
+                       q->p_pgrp->pg_jobc--;

                nq = q->p_osptr;
                if (nq != NULL)
                        nq->p_ysptr = NULL;
                nq = q->p_osptr;
                if (nq != NULL)
                        nq->p_ysptr = NULL;


@@ -158,31 +200,47 @@ done:
                 * Protect this process from future
                 * tty signals, clear TSTP/TTIN/TTOU if pending.
                 */
                 * Protect this process from future
                 * tty signals, clear TSTP/TTIN/TTOU if pending.
                 */

-               (void) spgrp(q, -1);
+               (void) spgrp(q);

        }
        p->p_cptr = NULL;
        psignal(p->p_pptr, SIGCHLD);
        wakeup((caddr_t)p->p_pptr);
        }
        p->p_cptr = NULL;
        psignal(p->p_pptr, SIGCHLD);
        wakeup((caddr_t)p->p_pptr);

+#if defined(tahoe)
+       dkeyrelease(p->p_dkey), p->p_dkey = 0;
+       ckeyrelease(p->p_ckey), p->p_ckey = 0;
+       u.u_pcb.pcb_savacc.faddr = (float *)NULL;
+#endif

        swtch();
 }
 
        swtch();
 }
 

-wait()
+#ifdef COMPAT_43
+owait()

 {
 {

-       struct rusage ru, *rup;
+       struct a {
+               int     pid;
+               union   wait *status;
+               int     options;
+               struct  rusage *rusage;
+       } *uap = (struct a *)u.u_ap;

 
        if ((u.u_ar0[PS] & PSL_ALLCC) != PSL_ALLCC) {
 
        if ((u.u_ar0[PS] & PSL_ALLCC) != PSL_ALLCC) {

-               u.u_error = wait1(0, (struct rusage *)0);
-               return;
+               uap->options = WSIGRESTART;
+               uap->rusage = 0;
+       } else {
+               uap->options = u.u_ar0[R0] | WSIGRESTART;
+               uap->rusage = (struct rusage *)u.u_ar0[R1];

        }
        }

-       rup = (struct rusage *)u.u_ar0[R1];
-       u.u_error = wait1(u.u_ar0[R0], &ru);
-       if (u.u_error)
-               return;
-       if (rup != (struct rusage *)0)
-               u.u_error = copyout((caddr_t)&ru, (caddr_t)rup,
-                   sizeof (struct rusage));
+       uap->pid = WAIT_ANY;
+       uap->status = 0;
+       wait1(1);

 }
 
 }
 

+wait4()
+{
+       wait1(0);
+}
+#endif
+

 /*
  * Wait system call.
  * Search for a terminated (zombie) child,
 /*
  * Wait system call.
  * Search for a terminated (zombie) child,


@@ -190,29 +248,59 @@ wait()
  * Look also for stopped (traced) children,
  * and pass back status from them.
  */
  * Look also for stopped (traced) children,
  * and pass back status from them.
  */

-wait1(options, ru)
-       register int options;
-       struct rusage *ru;
+#ifdef COMPAT_43
+wait1(compat)
+       int compat;
+#else
+wait4()
+#endif

 {
 {

+       register struct a {
+               int     pid;
+               union   wait *status;
+               int     options;
+               struct  rusage *rusage;
+       } *uap = (struct a *)u.u_ap;

        register f;
        register struct proc *p, *q;
        register f;
        register struct proc *p, *q;

+       union wait status;

 
        f = 0;
 
        f = 0;

-loop:

        q = u.u_procp;
        q = u.u_procp;

+       if (uap->pid == 0)
+               uap->pid = -q->p_pgid;
+       if (uap->options &~ (WUNTRACED|WNOHANG|WSIGRESTART)) {
+               u.u_error = EINVAL;
+               return;
+       }
+loop:

        for (p = q->p_cptr; p; p = p->p_osptr) {
        for (p = q->p_cptr; p; p = p->p_osptr) {

+               if (uap->pid != WAIT_ANY &&
+                   p->p_pid != uap->pid && p->p_pgid != -uap->pid)
+                       continue;

                f++;
                if (p->p_stat == SZOMB) {
                f++;
                if (p->p_stat == SZOMB) {

+                       pgrm(p);                        /* off pgrp */

                        u.u_r.r_val1 = p->p_pid;
                        u.u_r.r_val1 = p->p_pid;

-                       u.u_r.r_val2 = p->p_xstat;
-                       p->p_xstat = 0;
-                       if (ru && p->p_ru)
-                               *ru = *p->p_ru;
-                       if (p->p_ru) {
-                               ruadd(&u.u_cru, p->p_ru);
-                               (void) m_free(dtom(p->p_ru));
-                               p->p_ru = 0;
+#ifdef COMPAT_43
+                       if (compat)
+                               u.u_r.r_val2 = p->p_xstat;
+                       else
+#endif
+                       if (uap->status) {
+                               status.w_status = p->p_xstat;
+                               if (u.u_error = copyout((caddr_t)&status,
+                                   (caddr_t)uap->status, sizeof(status)))
+                                       return;

                        }
                        }

+                       p->p_xstat = 0;
+                       if (uap->rusage)
+                               u.u_error = copyout((caddr_t)p->p_ru,
+                                   (caddr_t)uap->rusage,
+                                   sizeof (struct rusage));
+                       ruadd(&u.u_cru, p->p_ru);
+                       FREE(p->p_ru, M_ZOMBIE);
+                       p->p_ru = 0;

                        p->p_stat = NULL;
                        p->p_pid = 0;
                        p->p_ppid = 0;
                        p->p_stat = NULL;
                        p->p_pid = 0;
                        p->p_ppid = 0;


@@ -234,32 +322,47 @@ loop:
                        p->p_sigcatch = 0;
                        p->p_sigignore = 0;
                        p->p_sigmask = 0;
                        p->p_sigcatch = 0;
                        p->p_sigignore = 0;
                        p->p_sigmask = 0;

-                       p->p_pgrp = 0;
+                       /*p->p_pgrp = 0;*/

                        p->p_flag = 0;
                        p->p_wchan = 0;
                        p->p_cursig = 0;
                        p->p_flag = 0;
                        p->p_wchan = 0;
                        p->p_cursig = 0;

-                       return (0);
+                       return;

                }
                }

-               if (p->p_stat == SSTOP && (p->p_flag&SWTED)==0 &&
-                   (p->p_flag&STRC || options&WUNTRACED)) {
+               if (p->p_stat == SSTOP && (p->p_flag & SWTED) == 0 &&
+                   (p->p_flag & STRC || uap->options & WUNTRACED)) {

                        p->p_flag |= SWTED;
                        u.u_r.r_val1 = p->p_pid;
                        p->p_flag |= SWTED;
                        u.u_r.r_val1 = p->p_pid;

-                       u.u_r.r_val2 = (p->p_cursig<<8) | WSTOPPED;
-                       return (0);
+#ifdef COMPAT_43
+                       if (compat)
+                               u.u_r.r_val2 = (p->p_cursig<<8) | WSTOPPED;
+                       else
+#endif
+                       if (uap->status) {
+                               status.w_status = 0;
+                               status.w_stopval = WSTOPPED;
+                               status.w_stopsig = p->p_cursig;
+                               u.u_error = copyout((caddr_t)&status,
+                                   (caddr_t)uap->status, sizeof(status));
+                       }
+                       return;

                }
        }
                }
        }

-       if (f == 0)
-               return (ECHILD);
-       if (options&WNOHANG) {
+       if (f == 0) {
+               u.u_error = ECHILD;
+               return;
+       }
+       if (uap->options & WNOHANG) {

                u.u_r.r_val1 = 0;
                u.u_r.r_val1 = 0;

-               return (0);
+               return;

        }
        }

-       if (setjmp(&u.u_qsave)) {
+       if (uap->options & WSIGRESTART && setjmp(&u.u_qsave)) {

                p = u.u_procp;
                p = u.u_procp;

-               if ((u.u_sigintr & sigmask(p->p_cursig)) != 0)
-                       return(EINTR);
+               if ((u.u_sigintr & sigmask(p->p_cursig)) != 0) {
+                       u.u_error = EINTR;
+                       return;
+               }

                u.u_eosys = RESTARTSYS;
                u.u_eosys = RESTARTSYS;

-               return (0);
+               return;

        }
        sleep((caddr_t)u.u_procp, PWAIT);
        goto loop;
        }
        sleep((caddr_t)u.u_procp, PWAIT);
        goto loop;