blkflush is no longer used;

[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 5c2f6a9..664595a 100644 (file)
--- a/usr/src/sys/kern/kern_exit.c
+++ b/usr/src/sys/kern/kern_exit.c
@@ -1,33 +1,54 @@
-/*     kern_exit.c     4.1     83/05/27        */
+/*
+ * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)kern_exit.c 7.13 (Berkeley) %G%
+ */

 
 

-#include "../machine/reg.h"
-#include "../machine/psl.h"
+#include "param.h"
+#include "systm.h"
+#include "map.h"
+#include "user.h"
+#include "kernel.h"
+#include "proc.h"
+#include "buf.h"
+#include "wait.h"
+#include "vm.h"
+#include "file.h"
+#include "vnode.h"
+#include "ioctl.h"
+#include "tty.h"
+#include "syslog.h"
+#include "malloc.h"

 
 

-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/map.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/proc.h"
-#include "../h/buf.h"
-#include "../h/wait.h"
-#include "../h/vm.h"
-#include "../h/file.h"
-#include "../h/mbuf.h"
-#include "../h/inode.h"
+#include "machine/reg.h"
+#ifdef COMPAT_43
+#include "machine/psl.h"
+#endif

 
 /*
  * Exit system call: pass back caller's arg
  */
 rexit()
 {
 
 /*
  * Exit system call: pass back caller's arg
  */
 rexit()
 {

-       register struct a {
+       struct a {

                int     rval;
        } *uap;
 
        uap = (struct a *)u.u_ap;
                int     rval;
        } *uap;
 
        uap = (struct a *)u.u_ap;

-       exit((uap->rval & 0377) << 8);
+       exit(W_EXITCODE(uap->rval, 0));

 }
 
 /*
 }
 
 /*


@@ -41,24 +62,22 @@ exit(rv)
        int rv;
 {
        register int i;
        int rv;
 {
        register int i;

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

        register int x;
        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_flag &= ~(STRC|SULOCK);
        p->p_flag |= SWEXIT;

-       (void) spl6();
-       /* we know SIG_IGN is 1 */
-       p->p_siga0 = ~0;
-       p->p_siga1 = 0;
-       (void) spl0();
+       p->p_sigignore = ~0;
+       p->p_sig = 0;

        p->p_cpticks = 0;
        p->p_pctcpu = 0;
        p->p_cpticks = 0;
        p->p_pctcpu = 0;

-       for (i=0; i<NSIG; i++)
+       for (i = 0; i < NSIG; i++)

                u.u_signal[i] = SIG_IGN;
        untimeout(realitexpire, (caddr_t)p);
        /*
                u.u_signal[i] = SIG_IGN;
        untimeout(realitexpire, (caddr_t)p);
        /*


@@ -75,33 +94,59 @@ 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;
                struct file *f;

-               int po;

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

-               u.u_ofile[i] = NULL;
-               po = u.u_pofile[i];
-               u.u_pofile[i] = 0;
-               closef(f, po);
+               if (f) {
+                       u.u_ofile[i] = NULL;
+                       u.u_pofile[i] = 0;
+                       (void) closef(f);
+               }
+       }
+       if (SESS_LEADER(p)) {
+               p->p_session->s_leader = 0;
+               if (p->p_session->s_ttyvp) {
+                       vgoneall(p->p_session->s_ttyvp);
+                       vrele(p->p_session->s_ttyvp);
+                       p->p_session->s_ttyvp = NULL;
+                       p->p_session->s_ttyp = NULL;
+               }

        }
        }

-       ilock(u.u_cdir);
-       iput(u.u_cdir);
+       VOP_LOCK(u.u_cdir);
+       vput(u.u_cdir);

        if (u.u_rdir) {
        if (u.u_rdir) {

-               ilock(u.u_rdir);
-               iput(u.u_rdir);
+               VOP_LOCK(u.u_rdir);
+               vput(u.u_rdir);

        }
        u.u_rlimit[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
        acct();
 #ifdef QUOTA
        qclean();
 #endif
        }
        u.u_rlimit[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
        acct();
 #ifdef QUOTA
        qclean();
 #endif

-#ifdef sun
-       ctxfree(u.u_procp);
+       crfree(u.u_cred);
+#ifdef KTRACE
+       /* 
+        * release trace file
+        */
+       if (p->p_tracep)
+               vrele(p->p_tracep);

 #endif
 #endif

-       vrelpt(u.u_procp);
+       /*
+       /*
+        * 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 */
+               p->p_nxt->p_prev = &p->p_nxt;
+       p->p_prev = &zombproc;
+       zombproc = p;

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


@@ -117,90 +162,107 @@ 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", WEXITSTATUS(rv));
+                       for (;;)
+                               ;
+               } else
+                       panic("init died");
+       }

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

-if (m == 0)
-panic("exit: m_getclr");
-       p->p_ru = mtod(m, struct rusage *);

        *p->p_ru = u.u_ru;
        ruadd(p->p_ru, &u.u_cru);
        *p->p_ru = u.u_ru;
        ruadd(p->p_ru, &u.u_cru);

-       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;
+       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) {
+               if (PGRP_JOBC(q))
+                       q->p_pgrp->pg_jobc--;
+               nq = q->p_osptr;
+               if (nq != NULL)
+                       nq->p_ysptr = NULL;
+               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]);
-                       /*
-                        * 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.
-                        */
-                       (void) spgrp(q, -1);
+               q->p_pptr = &proc[1];
+               q->p_ppid = 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.
+                */
+               (void) spgrp(q);
+       }
+       p->p_cptr = NULL;

        psignal(p->p_pptr, SIGCHLD);
        wakeup((caddr_t)p->p_pptr);
        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;
+       register struct a {
+               int     pid;
+               int     *status;
+               int     options;
+               struct  rusage *rusage;
+               int     compat;
+       } *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 = 0;
+               uap->rusage = 0;
+       } else {
+               uap->options = u.u_ar0[R0];
+               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;
-       (void) copyout((caddr_t)&ru, (caddr_t)rup, sizeof (struct rusage));
+       uap->pid = WAIT_ANY;
+       uap->status = 0;
+       uap->compat = 1;
+       u.u_error = wait1();

 }
 
 }
 

-#ifndef NOCOMPAT
-#include "../h/vtimes.h"
-
-owait()
+wait4()

 {
 {

-       struct rusage ru;
-       struct vtimes *vtp, avt;
+       register struct a {
+               int     pid;
+               int     *status;
+               int     options;
+               struct  rusage *rusage;
+               int     compat;
+       } *uap = (struct a *)u.u_ap;

 
 

-       if ((u.u_ar0[PS] & PSL_ALLCC) != PSL_ALLCC) {
-               u.u_error = wait1(0, (struct rusage *)0);
-               return;
-       }
-       vtp = (struct vtimes *)u.u_ar0[R1];
-       u.u_error = wait1(u.u_ar0[R0], &ru);
-       if (u.u_error)
-               return;
-       getvtimes(&ru, &avt);
-       (void) copyout((caddr_t)&avt, (caddr_t)vtp, sizeof (struct vtimes));
+       uap->compat = 0;
+       u.u_error = wait1();

 }
 }

+#else
+#define        wait1   wait4

 #endif
 
 /*
 #endif
 
 /*


@@ -210,30 +272,63 @@ owait()
  * 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;
+wait1()

 {
 {

+       register struct a {
+               int     pid;
+               int     *status;
+               int     options;
+               struct  rusage *rusage;
+#ifdef COMPAT_43
+               int compat;
+#endif
+       } *uap = (struct a *)u.u_ap;

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

+       int status, error;

 
 

-       f = 0;
+       q = u.u_procp;
+       if (uap->pid == 0)
+               uap->pid = -q->p_pgid;
+#ifdef notyet
+       if (uap->options &~ (WUNTRACED|WNOHANG))
+               return (EINVAL);
+#endif

 loop:
 loop:

-       for (p = proc; p < procNPROC; p++)
-       if (p->p_pptr == u.u_procp) {
+       f = 0;
+       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) {
                        u.u_r.r_val1 = p->p_pid;
                f++;
                if (p->p_stat == SZOMB) {
                        u.u_r.r_val1 = p->p_pid;

-                       u.u_r.r_val2 = p->p_xstat;
+#ifdef COMPAT_43
+                       if (uap->compat)
+                               u.u_r.r_val2 = p->p_xstat;
+                       else
+#endif
+                       if (uap->status) {
+                               status = p->p_xstat;    /* convert to int */
+                               if (error = copyout((caddr_t)&status,
+                                   (caddr_t)uap->status, sizeof(status)))
+                                       return (error);
+                       }
+                       if (uap->rusage && (error = copyout((caddr_t)p->p_ru,
+                           (caddr_t)uap->rusage, sizeof (struct rusage))))
+                               return (error);
+                       pgrm(p);                        /* off pgrp */

                        p->p_xstat = 0;
                        p->p_xstat = 0;

-                       if (ru)
-                               *ru = *p->p_ru;

                        ruadd(&u.u_cru, p->p_ru);
                        ruadd(&u.u_cru, p->p_ru);

-                       (void) m_free(dtom(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_ru = 0;
                        p->p_stat = NULL;
                        p->p_pid = 0;
                        p->p_ppid = 0;

+                       if (*p->p_prev = p->p_nxt)      /* off zombproc */
+                               p->p_nxt->p_prev = p->p_prev;
+                       p->p_nxt = freeproc;            /* onto freeproc */
+                       freeproc = p;

                        if (q = p->p_ysptr)
                                q->p_osptr = p->p_osptr;
                        if (q = p->p_osptr)
                        if (q = p->p_ysptr)
                                q->p_osptr = p->p_osptr;
                        if (q = p->p_osptr)


@@ -245,30 +340,44 @@ loop:
                        p->p_osptr = 0;
                        p->p_cptr = 0;
                        p->p_sig = 0;
                        p->p_osptr = 0;
                        p->p_cptr = 0;
                        p->p_sig = 0;

-                       p->p_siga0 = 0;
-                       p->p_siga1 = 0;
-                       p->p_pgrp = 0;
+                       p->p_sigcatch = 0;
+                       p->p_sigignore = 0;
+                       p->p_sigmask = 0;
+                       /*p->p_pgrp = 0;*/

                        p->p_flag = 0;
                        p->p_wchan = 0;
                        p->p_cursig = 0;
                        return (0);
                }
                        p->p_flag = 0;
                        p->p_wchan = 0;
                        p->p_cursig = 0;
                        return (0);
                }

-               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 (uap->compat) {
+                               u.u_r.r_val2 = W_STOPCODE(p->p_cursig);
+                               error = 0;
+                       } else
+#endif
+                       if (uap->status) {
+                               status = W_STOPCODE(p->p_cursig);
+                               error = copyout((caddr_t)&status,
+                                   (caddr_t)uap->status, sizeof(status));
+                       } else
+                               error = 0;
+                       return (error);

                }
        }
                }
        }

-       if (f == 0) {
+       if (f == 0)

                return (ECHILD);
                return (ECHILD);

-       }
-       if (options&WNOHANG) {
+       if (uap->options & WNOHANG) {

                u.u_r.r_val1 = 0;
                return (0);
        }
                u.u_r.r_val1 = 0;
                return (0);
        }

-       if ((u.u_procp->p_flag&SNUSIG) && setjmp(&u.u_qsave)) {
+       if (setjmp(&u.u_qsave)) {
+               p = u.u_procp;
+               if ((u.u_sigintr & sigmask(p->p_cursig)) != 0)
+                       return (EINTR);

                u.u_eosys = RESTARTSYS;
                return (0);
        }
                u.u_eosys = RESTARTSYS;
                return (0);
        }