correct no-such-process error

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

diff --git a/usr/src/sys/kern/kern_resource.c b/usr/src/sys/kern/kern_resource.c
index b488947..1f71393 100644 (file)
--- a/usr/src/sys/kern/kern_resource.c
+++ b/usr/src/sys/kern/kern_resource.c
@@ -1,16 +1,26 @@
-/*     kern_resource.c 4.12    82/09/04        */
+/*
+ * Copyright (c) 1982 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)kern_resource.c     6.9 (Berkeley) %G%
+ */
+
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "inode.h"
+#include "proc.h"
+#include "seg.h"
+#include "fs.h"
+#include "uio.h"
+#include "vm.h"
+#include "kernel.h"

 
 

-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/acct.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/inode.h"
-#include "../h/proc.h"
-#include "../h/seg.h"
-#include "../h/fs.h"
-#include "../h/uio.h"
-#include "../h/vm.h"
+/*
+ * Resource controls and accounting.
+ */

 
 getpriority()
 {
 
 getpriority()
 {


@@ -19,9 +29,8 @@ getpriority()
                int     who;
        } *uap = (struct a *)u.u_ap;
        register struct proc *p;
                int     who;
        } *uap = (struct a *)u.u_ap;
        register struct proc *p;

+       int low = PRIO_MAX + 1;

 
 

-       u.u_r.r_val1 = NZERO+20;
-       u.u_error = ESRCH;

        switch (uap->which) {
 
        case PRIO_PROCESS:
        switch (uap->which) {
 
        case PRIO_PROCESS:


@@ -30,26 +39,39 @@ getpriority()
                else
                        p = pfind(uap->who);
                if (p == 0)
                else
                        p = pfind(uap->who);
                if (p == 0)

-                       return;
-               u.u_r.r_val1 = u.u_procp->p_nice;
+                       break;
+               low = p->p_nice;

                break;
 
        case PRIO_PGRP:
                if (uap->who == 0)
                        uap->who = u.u_procp->p_pgrp;
                break;
 
        case PRIO_PGRP:
                if (uap->who == 0)
                        uap->who = u.u_procp->p_pgrp;

-               for (p = proc; p < procNPROC; p++)
+               for (p = allproc; p != NULL; p = p->p_nxt) {

                        if (p->p_pgrp == uap->who &&
                        if (p->p_pgrp == uap->who &&

-                           p->p_nice < u.u_r.r_val1) {
-                               u.u_r.r_val1 = p->p_nice;
-                               u.u_error = 0;
-                       }
+                           p->p_nice < low)
+                               low = p->p_nice;
+               }
+               break;
+
+       case PRIO_USER:
+               if (uap->who == 0)
+                       uap->who = u.u_uid;
+               for (p = allproc; p != NULL; p = p->p_nxt) {
+                       if (p->p_uid == uap->who &&
+                           p->p_nice < low)
+                               low = p->p_nice;
+               }

                break;
 
        default:
                u.u_error = EINVAL;
                break;
 
        default:
                u.u_error = EINVAL;

-               break;
+               return;
+       }
+       if (low == PRIO_MAX + 1) {
+               u.u_error = ESRCH;
+               return;

        }
        }

-       u.u_r.r_val1 -= NZERO;
+       u.u_r.r_val1 = low;

 }
 
 setpriority()
 }
 
 setpriority()


@@ -60,27 +82,47 @@ setpriority()
                int     prio;
        } *uap = (struct a *)u.u_ap;
        register struct proc *p;
                int     prio;
        } *uap = (struct a *)u.u_ap;
        register struct proc *p;

+       int found = 0;

 
 

-       u.u_error = ESRCH;

        switch (uap->which) {
 
        case PRIO_PROCESS:
        switch (uap->which) {
 
        case PRIO_PROCESS:

-               p = pfind(uap->who);
+               if (uap->who == 0)
+                       p = u.u_procp;
+               else
+                       p = pfind(uap->who);

                if (p == 0)
                if (p == 0)

-                       return;
+                       break;

                donice(p, uap->prio);
                donice(p, uap->prio);

+               found++;

                break;
 
        case PRIO_PGRP:
                break;
 
        case PRIO_PGRP:

-               for (p = proc; p < procNPROC; p++)
-                       if (p->p_pgrp == uap->who)
+               if (uap->who == 0)
+                       uap->who = u.u_procp->p_pgrp;
+               for (p = allproc; p != NULL; p = p->p_nxt)
+                       if (p->p_pgrp == uap->who) {
+                               donice(p, uap->prio);
+                               found++;
+                       }
+               break;
+
+       case PRIO_USER:
+               if (uap->who == 0)
+                       uap->who = u.u_uid;
+               for (p = allproc; p != NULL; p = p->p_nxt)
+                       if (p->p_uid == uap->who) {

                                donice(p, uap->prio);
                                donice(p, uap->prio);

+                               found++;
+                       }

                break;
 
        default:
                u.u_error = EINVAL;
                break;
 
        default:
                u.u_error = EINVAL;

-               break;
+               return;

        }
        }

+       if (found == 0)
+               u.u_error = ESRCH;

 }
 
 donice(p, n)
 }
 
 donice(p, n)


@@ -93,20 +135,19 @@ donice(p, n)
                u.u_error = EPERM;
                return;
        }
                u.u_error = EPERM;
                return;
        }

-       n += p->p_nice;
-       if (n >= 2*NZERO)
-               n = 2*NZERO - 1;
-       if (n < 0)
-               n = 0;
-       if (n < p->p_nice && !suser())
+       if (n > PRIO_MAX)
+               n = PRIO_MAX;
+       if (n < PRIO_MIN)
+               n = PRIO_MIN;
+       if (n < p->p_nice && !suser()) {
+               u.u_error = EACCES;

                return;
                return;

+       }

        p->p_nice = n;
        (void) setpri(p);
        p->p_nice = n;
        (void) setpri(p);

-       if (u.u_error == ESRCH)
-               u.u_error = 0;

 }
 
 }
 

-setlimit()
+setrlimit()

 {
        register struct a {
                u_int   which;
 {
        register struct a {
                u_int   which;


@@ -114,29 +155,34 @@ setlimit()
        } *uap = (struct a *)u.u_ap;
        struct rlimit alim;
        register struct rlimit *alimp;
        } *uap = (struct a *)u.u_ap;
        struct rlimit alim;
        register struct rlimit *alimp;

+       extern unsigned maxdmap;

 
        if (uap->which >= RLIM_NLIMITS) {
                u.u_error = EINVAL;
                return;
        }
        alimp = &u.u_rlimit[uap->which];
 
        if (uap->which >= RLIM_NLIMITS) {
                u.u_error = EINVAL;
                return;
        }
        alimp = &u.u_rlimit[uap->which];

-       if (copyin((caddr_t)uap->lim, (caddr_t)&alim, sizeof (struct rlimit))) {
-               u.u_error = EFAULT;
+       u.u_error = copyin((caddr_t)uap->lim, (caddr_t)&alim,
+               sizeof (struct rlimit));
+       if (u.u_error)

                return;
                return;

-       }

        if (alim.rlim_cur > alimp->rlim_max || alim.rlim_max > alimp->rlim_max)
                if (!suser())
                        return;
        switch (uap->which) {
 
        case RLIMIT_DATA:
        if (alim.rlim_cur > alimp->rlim_max || alim.rlim_max > alimp->rlim_max)
                if (!suser())
                        return;
        switch (uap->which) {
 
        case RLIMIT_DATA:

-               if (alim.rlim_cur > ctob(MAXDSIZ))
-                       alim.rlim_cur = ctob(MAXDSIZ);
+               if (alim.rlim_cur > maxdmap)
+                       alim.rlim_cur = maxdmap;
+               if (alim.rlim_max > maxdmap)
+                       alim.rlim_max = maxdmap;

                break;
 
        case RLIMIT_STACK:
                break;
 
        case RLIMIT_STACK:

-               if (alim.rlim_cur > ctob(MAXSSIZ))
-                       alim.rlim_cur = ctob(MAXSSIZ);
+               if (alim.rlim_cur > maxdmap)
+                       alim.rlim_cur = maxdmap;
+               if (alim.rlim_max > maxdmap)
+                       alim.rlim_max = maxdmap;

                break;
        }
        *alimp = alim;
                break;
        }
        *alimp = alim;


@@ -144,7 +190,7 @@ setlimit()
                u.u_procp->p_maxrss = alim.rlim_cur/NBPG;
 }
 
                u.u_procp->p_maxrss = alim.rlim_cur/NBPG;
 }
 

-getlimit()
+getrlimit()

 {
        register struct a {
                u_int   which;
 {
        register struct a {
                u_int   which;


@@ -155,11 +201,8 @@ getlimit()
                u.u_error = EINVAL;
                return;
        }
                u.u_error = EINVAL;
                return;
        }

-       if (copyout((caddr_t)&u.u_rlimit[uap->which], uap->rlp,
-           sizeof (struct rlimit))) {
-               u.u_error = EFAULT;
-               return;
-       }
+       u.u_error = copyout((caddr_t)&u.u_rlimit[uap->which], (caddr_t)uap->rlp,
+           sizeof (struct rlimit));

 }
 
 getrusage()
 }
 
 getrusage()


@@ -184,16 +227,14 @@ getrusage()
                u.u_error = EINVAL;
                return;
        }
                u.u_error = EINVAL;
                return;
        }

-       if (copyout((caddr_t)rup, uap->rusage, sizeof (struct rusage))) {
-               u.u_error = EFAULT;
-               return;
-       }
+       u.u_error = copyout((caddr_t)rup, (caddr_t)uap->rusage,
+           sizeof (struct rusage));

 }
 
 ruadd(ru, ru2)
        register struct rusage *ru, *ru2;
 {
 }
 
 ruadd(ru, ru2)
        register struct rusage *ru, *ru2;
 {

-       register int *ip, *ip2;
+       register long *ip, *ip2;

        register int i;
 
        timevaladd(&ru->ru_utime, &ru2->ru_utime);
        register int i;
 
        timevaladd(&ru->ru_utime, &ru2->ru_utime);


@@ -204,138 +245,3 @@ ruadd(ru, ru2)
        for (i = &ru->ru_last - &ru->ru_first; i > 0; i--)
                *ip++ += *ip2++;
 }
        for (i = &ru->ru_last - &ru->ru_first; i > 0; i--)
                *ip++ += *ip2++;
 }

-
-struct inode *acctp;
-struct inode *savacctp;
-
-long   acctlow = 2;            /* stop accounting when < 2% data space left */
-long   accthigh = 4;           /* resume when space risen to > 4% */
-
-/*
- * Perform process accounting functions.
- */
-sysacct()
-{
-       register struct inode *ip;
-       register struct a {
-               char    *fname;
-       } *uap;
-
-       uap = (struct a *)u.u_ap;
-       if (suser()) {
-               if (savacctp) {
-                       acctp = savacctp;
-                       savacctp = NULL;
-               }
-               if (uap->fname==NULL) {
-                       if (ip = acctp) {
-                               irele(ip);
-                               acctp = NULL;
-                       }
-                       return;
-               }
-               ip = namei(uchar, 0, 1);
-               if(ip == NULL)
-                       return;
-               if((ip->i_mode & IFMT) != IFREG) {
-                       u.u_error = EACCES;
-                       iput(ip);
-                       return;
-               }
-               if (acctp && (acctp->i_number != ip->i_number ||
-                   acctp->i_dev != ip->i_dev))
-                       irele(acctp);
-               acctp = ip;
-               iunlock(ip);
-       }
-}
-
-struct acct acctbuf;
-/*
- * On exit, write a record on the accounting file.
- */
-acct()
-{
-       register i;
-       register struct inode *ip;
-       off_t siz;
-       register struct acct *ap = &acctbuf;
-
-       if (savacctp && savacctp->i_fs->fs_cstotal.cs_nbfree >
-           accthigh * savacctp->i_fs->fs_dsize / 100) {
-               acctp = savacctp;
-               savacctp = NULL;
-               printf("Accounting resumed\n");
-       }
-       if ((ip=acctp)==NULL)
-               return;
-       if (acctp->i_fs->fs_cstotal.cs_nbfree <
-           acctlow * acctp->i_fs->fs_dsize / 100) {
-               savacctp = acctp;
-               acctp = NULL;
-               printf("Accounting suspended\n");
-               return;
-       }
-       ilock(ip);
-       for (i=0; i<sizeof(ap->ac_comm); i++)
-               ap->ac_comm[i] = u.u_comm[i];
-       ap->ac_utime = compress((long)u.u_ru.ru_utime.tv_sec);
-       ap->ac_stime = compress((long)u.u_ru.ru_stime.tv_sec);
-       ap->ac_etime = compress((long)(time - u.u_start));
-       ap->ac_btime = u.u_start;
-       ap->ac_uid = u.u_ruid;
-       ap->ac_gid = u.u_rgid;
-       ap->ac_mem = 0;
-       if (i = u.u_ru.ru_utime.tv_sec + u.u_ru.ru_stime.tv_sec)
-               ap->ac_mem =
-                   (u.u_ru.ru_ixrss + u.u_ru.ru_idrss + u.u_ru.ru_isrss) / i;
-       ap->ac_io = compress((long)(u.u_ru.ru_inblock + u.u_ru.ru_oublock));
-       if (u.u_ttyp)
-               ap->ac_tty = u.u_ttyd;
-       else
-               ap->ac_tty = NODEV;
-       ap->ac_flag = u.u_acflag;
-       siz = ip->i_size;
-       u.u_error =
-           rdwri(UIO_WRITE, ip, (caddr_t)ap, sizeof (acctbuf), siz,
-               1, (int *)0);
-       if (u.u_error)
-               ip->i_size = siz;
-       iunlock(ip);
-}
-
-/*
- * Produce a pseudo-floating point representation
- * with 3 bits base-8 exponent, 13 bits fraction.
- */
-compress(t)
-register long t;
-{
-       register exp = 0, round = 0;
-
-       while (t >= 8192) {
-               exp++;
-               round = t&04;
-               t >>= 3;
-       }
-       if (round) {
-               t++;
-               if (t >= 8192) {
-                       t >>= 3;
-                       exp++;
-               }
-       }
-       return((exp<<13) + t);
-}
-
-#ifndef NOCOMPAT
-onice()
-{
-       register struct a {
-               int     niceness;
-       } *uap;
-
-       uap = (struct a *)u.u_ap;
-       donice(u.u_procp, uap->niceness);
-}
-#endif