telnet line mode 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 4c66cd2..4f7b509 100644 (file)
--- a/usr/src/sys/kern/kern_exit.c
+++ b/usr/src/sys/kern/kern_exit.c
@@ -1,18 +1,25 @@
 /*
 /*

- * Copyright (c) 1982 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)kern_exit.c 6.13 (Berkeley) %G%
+ * 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.19 (Berkeley) %G%

  */
 
  */
 

-#include "../machine/reg.h"
-#include "../machine/psl.h"
-

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

-#include "dir.h"

 #include "user.h"
 #include "kernel.h"
 #include "proc.h"
 #include "user.h"
 #include "kernel.h"
 #include "proc.h"


@@ -20,21 +27,28 @@
 #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 "vnode.h"
+#include "ioctl.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
  */
 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));

 }
 
 /*
 }
 
 /*


@@ -49,16 +63,18 @@ exit(rv)
 {
        register int i;
        register struct proc *p, *q, *nq;
 {
        register int i;
        register struct proc *p, *q, *nq;

-       register int x;
-       struct mbuf *m = m_getclr(M_WAIT, MT_ZOMBIE);
+       register struct proc **pp;

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

+       p->p_sig = 0;

        p->p_cpticks = 0;
        p->p_pctcpu = 0;
        for (i = 0; i < NSIG; i++)
        p->p_cpticks = 0;
        p->p_pctcpu = 0;
        for (i = 0; i < NSIG; i++)


@@ -69,9 +85,13 @@ exit(rv)
         * a vfork(), instead give the resources back to
         * the parent.
         */
         * a vfork(), instead give the resources back to
         * the parent.
         */

-       if ((p->p_flag & SVFORK) == 0)
+       if ((p->p_flag & SVFORK) == 0) {
+#ifdef MAPMEM
+               if (u.u_mmap)
+                       mmexit();
+#endif

                vrelvm();
                vrelvm();

-       else {
+       } else {

                p->p_flag &= ~SVFORK;
                wakeup((caddr_t)p);
                while ((p->p_flag & SVFDONE) == 0)
                p->p_flag &= ~SVFORK;
                wakeup((caddr_t)p);
                while ((p->p_flag & SVFDONE) == 0)


@@ -85,19 +105,36 @@ exit(rv)
                if (f) {
                        u.u_ofile[i] = NULL;
                        u.u_pofile[i] = 0;
                if (f) {
                        u.u_ofile[i] = NULL;
                        u.u_pofile[i] = 0;

-                       closef(f);
+                       (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;
+                       /*
+                        * s_ttyp is not zero'd; we use this to indicate
+                        * that the session once had a controlling terminal.
+                        */

                }
        }
                }
        }

-       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();
        }
        u.u_rlimit[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
        acct();

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

 #endif
        /*
         * Freeing the user structure and kernel stack
 #endif
        /*
         * Freeing the user structure and kernel stack


@@ -116,34 +153,35 @@ exit(rv)
        multprog--;
        p->p_stat = SZOMB;
        noproc = 1;
        multprog--;
        p->p_stat = SZOMB;
        noproc = 1;

-       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");
-       }
+       for (pp = &pidhash[PIDHASH(p->p_pid)]; *pp; pp = &(*pp)->p_hash)
+               if (*pp == p) {
+                       *pp = p->p_hash;
+                       goto done;
+               }
+       panic("exit");
+done:

        if (p->p_pid == 1) {
                if (p->p_dsize == 0) {
        if (p->p_pid == 1) {
                if (p->p_dsize == 0) {

-                       printf("Can't exec /etc/init\n");
+                       printf("Can't exec init (errno %d)\n", WEXITSTATUS(rv));

                        for (;;)
                                ;
                } else
                        panic("init died");
        }
                        for (;;)
                                ;
                } else
                        panic("init died");
        }

-done:

        p->p_xstat = rv;
        p->p_xstat = rv;

-       p->p_ru = mtod(m, struct rusage *);

        *p->p_ru = u.u_ru;
        *p->p_ru = u.u_ru;

+       i = splclock();
+       p->p_ru->ru_stime = p->p_stime;
+       p->p_ru->ru_utime = p->p_utime;
+       splx(i);

        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]);
        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 (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;


@@ -179,25 +217,54 @@ done:
        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;
+       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;
-       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;
+       uap->compat = 1;
+       u.u_error = wait1();
+}
+
+wait4()
+{
+       register struct a {
+               int     pid;
+               int     *status;
+               int     options;
+               struct  rusage *rusage;
+               int     compat;
+       } *uap = (struct a *)u.u_ap;
+
+       uap->compat = 0;
+       u.u_error = wait1();

 }
 }

+#else
+#define        wait1   wait4
+#endif

 
 /*
  * Wait system call.
 
 /*
  * Wait system call.


@@ -206,29 +273,56 @@ 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;
+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;
-loop:

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

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

        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) {
                        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;
-                       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 (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;
+                       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;


@@ -250,33 +344,38 @@ 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;
                        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)
                return (ECHILD);
                }
        }
        if (f == 0)
                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 (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);
-       }
-       sleep((caddr_t)u.u_procp, PWAIT);
+       if (error = tsleep((caddr_t)u.u_procp, PWAIT | PCATCH, "wait", 0))
+               return (error);

        goto loop;
 }
        goto loop;
 }