[BACK]Return to kern_fork.c CVS log [TXT] [DIR] Up to [DragonFly] / src / sys / kern

Diff for /src/sys/kern/kern_fork.c between versions 1.17 and 1.18

version 1.17, 2003/11/27 19:57:37 version 1.18, 2004/02/10 15:31:47
Line 36 Line 36
  * SUCH DAMAGE.   * SUCH DAMAGE.
  *   *
  *      @(#)kern_fork.c 8.6 (Berkeley) 4/8/94   *      @(#)kern_fork.c 8.6 (Berkeley) 4/8/94
  * $FreeBSD: src/sys/kern/kern_fork.c,v 1.72.2.13 2003/06/06 20:21:32 tegge Exp $   * $FreeBSD: src/sys/kern/kern_fork.c,v 1.72.2.14 2003/06/26 04:15:10 silby Exp $
  * $DragonFly$   * $DragonFly$
  */   */
   
Line 183  fork1(p1, flags, procp) Line 183  fork1(p1, flags, procp)
         uid_t uid;          uid_t uid;
         struct proc *newproc;          struct proc *newproc;
         int ok;          int ok;
         static int pidchecked = 0;          static int curfail = 0, pidchecked = 0;
           static struct timeval lastfail;
         struct forklist *ep;          struct forklist *ep;
         struct filedesc_to_leader *fdtol;          struct filedesc_to_leader *fdtol;
   
Line 232  fork1(p1, flags, procp) Line 233  fork1(p1, flags, procp)
          */           */
         uid = p1->p_ucred->cr_ruid;          uid = p1->p_ucred->cr_ruid;
         if ((nprocs >= maxproc - 10 && uid != 0) || nprocs >= maxproc) {          if ((nprocs >= maxproc - 10 && uid != 0) || nprocs >= maxproc) {
                   if (ppsratecheck(&lastfail, &curfail, 1))
                           printf("maxproc limit exceeded by uid %d, please "
                                  "see tuning(7) and login.conf(5).\n", uid);
                 tsleep(&forksleep, 0, "fork", hz / 2);                  tsleep(&forksleep, 0, "fork", hz / 2);
                 return (EAGAIN);                  return (EAGAIN);
         }          }
Line 252  fork1(p1, flags, procp) Line 256  fork1(p1, flags, procp)
                  * Back out the process count                   * Back out the process count
                  */                   */
                 nprocs--;                  nprocs--;
                   if (ppsratecheck(&lastfail, &curfail, 1))
                           printf("maxproc limit exceeded by uid %d, please "
                                  "see tuning(7) and login.conf(5).\n", uid);
                 tsleep(&forksleep, 0, "fork", hz / 2);                  tsleep(&forksleep, 0, "fork", hz / 2);
                 return (EAGAIN);                  return (EAGAIN);
         }          }
Removed from v.1.17  
changed lines
  Added in v.1.18